From 7b97cd8a503282a8d76739356e9683dacde1c977 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 4 Apr 2023 18:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=BC=BA=E5=A4=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadService.java | 8 +++- .../controller/inout/WareHouseController.java | 29 +++++++++----- .../admin/dao/inout/IoCodeLostMapper.java | 4 ++ .../admin/entity/inout/IoCodeLostEntity.java | 4 +- .../admin/res/basic/SpsSyncDataResponse.java | 3 ++ .../service/inout/IoCodeLostService.java | 1 + .../inout/impl/IoCodeLostServiceImpl.java | 5 +++ .../thread/BasicBackUpdateProductService.java | 1 - .../admin/thread/IoTransInoutService.java | 11 +++++- .../mybatis/mapper/inout/IoCodeLostMapper.xml | 38 ++++++++++++++----- 10 files changed, 80 insertions(+), 24 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 7c69059..aa3c66a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -36,6 +36,7 @@ import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.sale.admin.res.inout.IoCodeLostResponse; import com.glxp.sale.admin.res.param.SyncDataSetResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.DeptService; @@ -350,10 +351,15 @@ public class SpsSyncDownloadService { } syncDataResponse.setSupCertEntities(supCertEntityList); + IoCodeLostEntity ioCodeLostEntity = new IoCodeLostEntity(); + ioCodeLostEntity.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List ioCodeLostEntities = ioCodeLostService.filterList(ioCodeLostEntity); + syncDataResponse.setIoCodeLostEntities(ioCodeLostEntities); return ResultVOUtils.success(syncDataResponse); } - + @Resource + IoCodeLostService ioCodeLostService; //单据类型 @Resource BussinessTypeService bussinessTypeService; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 9d86ec0..76ad0f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -595,6 +595,8 @@ public class WareHouseController { @Resource InvProductDetailService invProductDetailService; + @Resource + IoCodeLostService codeLostService; //网页端数据上传调用接口 @AuthRuleAnnotation("") @@ -652,16 +654,25 @@ public class WareHouseController { BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); if (checkOriginCodeRes != null) { - if (StrUtil.isNotEmpty(orderId)) { - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setOrderId(orderId); - List warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest); - WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys); - if (warehouseEntity == null) { + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); + if (codeLostEntity == null) { + if (StrUtil.isNotEmpty(orderId)) { + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setOrderId(orderId); + List warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest); + WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys); + if (warehouseEntity == null) { + return checkOriginCodeRes; + } + } else return checkOriginCodeRes; - } - } else - return checkOriginCodeRes; + } else { + udiEntity.setBatchNo(codeLostEntity.getBatchNo()); + udiEntity.setExpireDate(codeLostEntity.getExpireDate()); + udiEntity.setProduceDate(codeLostEntity.getProduceDate()); + } + + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IoCodeLostMapper.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IoCodeLostMapper.java index 88f8fa0..e743053 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IoCodeLostMapper.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IoCodeLostMapper.java @@ -10,5 +10,9 @@ import java.util.List; @Mapper public interface IoCodeLostMapper extends BaseMapperPlus { List selectLost(IoCodeLostEntity ioCodeLostEntity); + + List filterList(IoCodeLostEntity ioCodeLostEntity); + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IoCodeLostEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IoCodeLostEntity.java index 90b4ad4..1636ae4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IoCodeLostEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IoCodeLostEntity.java @@ -86,8 +86,8 @@ public class IoCodeLostEntity { @TableField(exist = false) private String endTime; - - + @TableField(exist = false) + private String lastUpdateTime; public static final String COL_ID = "id"; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 6454d86..b1fe9e0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.entity.basic.NewUploadDiEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; +import com.glxp.sale.admin.entity.inout.IoCodeLostEntity; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; @@ -64,4 +65,6 @@ public class SpsSyncDataResponse { List supCertEntities; + List ioCodeLostEntities; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IoCodeLostService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IoCodeLostService.java index 4d1d5f3..5bd6dbe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IoCodeLostService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/IoCodeLostService.java @@ -10,6 +10,7 @@ public interface IoCodeLostService { List selectLost(IoCodeLostEntity ioCodeLostEntity); + List filterList(IoCodeLostEntity ioCodeLostEntity); IoCodeLostEntity findByCode(String code); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IoCodeLostServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IoCodeLostServiceImpl.java index aea8fee..065dd01 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IoCodeLostServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IoCodeLostServiceImpl.java @@ -22,6 +22,11 @@ public class IoCodeLostServiceImpl implements IoCodeLostService { return codeLostEntityMapper.selectLost(ioCodeLostEntity); } + @Override + public List filterList(IoCodeLostEntity ioCodeLostEntity) { + return codeLostEntityMapper.filterList(ioCodeLostEntity); + } + @Override public IoCodeLostEntity findByCode(String code) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 7cffa04..ee77699 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -291,7 +291,6 @@ public class BasicBackUpdateProductService { //自动创建要求被下载单据类型任务 BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData(ConstantStatus.SYNC_BUS_TYPE, 0); if (basicExportStatusEntity2 == null) { - BaseResponse baseResponse = spsSyncDownloadService.findBusType(getRequest(ConstantStatus.SYNC_BUS_TYPE)); SpsSyncBusResponse spsSyncBusResponse = baseResponse.getData(); if (CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities()) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index ae43b81..27a53f9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -1061,8 +1061,13 @@ public class IoTransInoutService { for (WarehouseEntity codeEntity : ioCodeEntities) { UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode()); IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode()); - if (codeLostEntity == null) + if (codeLostEntity == null) { codeLostEntity = new IoCodeLostEntity(); + codeLostEntity.setCode(codeEntity.getCode()); + codeLostEntity.setNameCode(codeEntity.getNameCode()); + codeLostEntity.setCreateTime(new Date()); + codeLostEntity.setSupId(codeEntity.getSupId()); + } //校验是否写入缺失表 boolean isTrue = false; @@ -1085,8 +1090,10 @@ public class IoTransInoutService { isTrue = true; } } - if (isTrue) + if (isTrue) { + codeLostEntity.setUpdateTime(new Date()); codeLostService.insertOrUpdate(codeLostEntity); + } } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml b/api-admin/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml index e6cb92f..91e8ff0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml @@ -1,29 +1,49 @@ - - + +