From 46e96c44e1602cbfc0a3644a01db075ede12df02 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 27 Nov 2024 09:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8B=89=E5=8F=96=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicSkPrescribeController.java | 1 + .../collect/IoCollectOriginController.java | 4 +- .../api/entity/thrsys/ThrProductsEntity.java | 1 + .../com/glxp/api/http/ErpBasicClient.java | 4 +- .../glxp/api/http/req/UdiwmsUnitRequest.java | 2 +- .../req/basic/SickerPrescribeSaveRequest.java | 2 +- .../thrsys/impl/ThrDeptServiceImpl.java | 39 +++++++++++++++++-- 7 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index bd3f234a5..a48213b2a 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -138,6 +138,7 @@ public class BasicSkPrescribeController extends BaseController { collectOrderRequest.setEndTime(sickerPrescribeSaveRequest.getEndTime()); collectOrderRequest.setBusType(sickerPrescribeSaveRequest.getBusType()); collectOrderRequest.setBillNo(sickerPrescribeSaveRequest.getBillNo()); + collectOrderRequest.setKeyWords(sickerPrescribeSaveRequest.getKeyWords()); return collectOriginService.downloadOrderV2(collectOrderRequest); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 5a694fd7d..694a74bac 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -81,10 +81,10 @@ public class IoCollectOriginController extends BaseController { getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); if (StrUtil.isNotEmpty(collectOrderRequest.getStartTime())){ - getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + "00:00:00"); + getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime() + " 00:00:00"); } if (StrUtil.isNotEmpty(collectOrderRequest.getEndTime())){ - getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ "23:59:59"); + getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()+ " 23:59:59"); } getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index 824ec5b89..be07ceab5 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -51,6 +51,7 @@ public class ThrProductsEntity { /** * 生产厂家 */ + @TableField("manufactory") private String manufactory; @TableField("thirdSysFk") diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index f840131ed..3da7a027f 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -24,6 +24,7 @@ import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.OkHttpCli; import lombok.extern.slf4j.Slf4j; import okhttp3.*; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -54,7 +55,8 @@ public class ErpBasicClient { public BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); BeanUtils.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); - udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId()); + String unitId = StringUtils.isNotEmpty(thrUnitMaintainFilterRequest.getErpId()) ? thrUnitMaintainFilterRequest.getErpId() : thrUnitMaintainFilterRequest.getUnitId(); + udiwmsUnitRequest.setUnitId(unitId); ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSysFk()); try { String url = thrSystemEntity.getThridUrl() + "/udiwms/erp/getUnits"; diff --git a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java index 536ba1caf..5875a7430 100644 --- a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java +++ b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class UdiwmsUnitRequest extends ListPageRequest { - String key; + private String key; private String unitId; private String name; } diff --git a/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java index 230f35a06..8d6f589f3 100644 --- a/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java @@ -19,7 +19,7 @@ public class SickerPrescribeSaveRequest { private String endTime; private String startTime; - + private String keyWords; @NotNull(message = "处方列表不可以为空！") private List list; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index 6a0d2d4d3..fd73a4234 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -35,7 +35,10 @@ public class ThrDeptServiceImpl extends ServiceImpl i private ErpBasicClient erpBasicClient; @Resource private ThrInvWarehouseDao thrInvWarehouseDao; - + @Resource + private ThrDeptServiceImpl thrDeptService; + @Resource + private ThrInvWarehouseServiceImpl thrInvWarehouseService; @Override public ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault) { @@ -161,9 +164,39 @@ public class ThrDeptServiceImpl extends ServiceImpl i } + thrDeptDao.delete(new QueryWrapper<>()); + thrInvWarehouseDao.delete(new QueryWrapper<>()); + + thrInvWarehouseService.saveBatch(warehouseList); + this.saveBatch(list); +// if(list!= null && list.size() >0){ +// for (ThrDeptEntity thrDeptEntity : list) { +// QueryWrapper queryWrapper = new QueryWrapper().eq("code",thrDeptEntity.getCode()); +// ThrDeptEntity thrDeptEntityNew = thrDeptDao.selectOne(queryWrapper); +// if(thrDeptEntityNew!=null){ +// thrDeptDao.update(thrDeptEntity,queryWrapper); +// }else { +// thrDeptDao.insert(thrDeptEntity); +// +// } +// } +// } +// if(warehouseList!= null && warehouseList.size() >0){ +// for (ThrInvWarehouseEntity invWarehouseEntity : warehouseList) { +// QueryWrapper queryWrapper = new QueryWrapper().eq("code",invWarehouseEntity.getCode()); +// ThrInvWarehouseEntity thrInvWarehouseEntityNew = thrInvWarehouseDao.selectOne(queryWrapper); +// if(thrInvWarehouseEntityNew!=null){ +// thrInvWarehouseDao.update(invWarehouseEntity,queryWrapper); +// }else { +// thrInvWarehouseDao.insert(invWarehouseEntity); +// +// } +// } +// } //插入数据 - thrDeptDao.insertThrDeptList(list); - thrInvWarehouseDao.insertThrInvWarehouses(warehouseList); +// thrDeptDao.insertOrUpdateBatch(list); +// thrInvWarehouseDao.insertOrUpdateBatch(warehouseList); +// thrInvWarehouseDao.insertThrInvWarehouses(warehouseList); if (list.size() >= limit) { page++; } else {