From 535e7be48680057b1550601697e74f3fe470a9a2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 9 Oct 2021 18:17:53 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/thrsys/ThrInvProductsEntity.java | 5 ++++ .../admin/req/inventory/ErpOnhandRequest.java | 6 +++++ .../thrsys/FilterThrInvProductsRequest.java | 6 +++++ .../res/inventory/ErpInvProductResponse.java | 1 + .../admin/thread/ThrInvProductsDlService.java | 13 ++++++++--- .../glxp/api/admin/util/FilterUdiUtils.java | 2 +- .../main/resources/application-dev.properties | 8 +++---- .../mapper/thrsys/ThrInvProductsDao.xml | 23 +++++++++++++------ 8 files changed, 49 insertions(+), 15 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java index 6fac6a05..216642ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java @@ -22,6 +22,11 @@ public class ThrInvProductsEntity { private String spaceName; private String thirdSysFk; private Date updateTime; + private String manufactory; + + + private String code; + private String name; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java index 5fe167bc..d47f06ab 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -22,4 +22,10 @@ public class ErpOnhandRequest extends ListPageRequest { private Boolean isDownThrSys; List thrInvProductsEntities; + + + + private String spec; + private String registerCertNo; + private String manufactory; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java index 72c576e7..dfb07f5f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java @@ -20,4 +20,10 @@ public class FilterThrInvProductsRequest extends ListPageRequest { private String nameCode; private String thirdSys; List erpInvProductResponses; + + + + private String spec; + private String registerCertNo; + private String manufactory; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java index e96d2b8a..933767c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java @@ -18,4 +18,5 @@ public class ErpInvProductResponse { private String thirdSysFk; private String spec; private Integer count; + private String manufactory; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java index 6367280e..9734bb6d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java @@ -46,7 +46,7 @@ public class ThrInvProductsDlService { @Async - public void importSelcyInvProducrs(String genKey,String thirdSys, List erpInvProductResponses) { + public void importSelcyInvProducrs(String genKey, String thirdSys, List erpInvProductResponses) { ThrInvProductsImportLogEntity thrInvProductsImportLogEntity = thrInvProductsImportLogService.selectByGenKey(genKey); BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSys); if (piDetailEntity == null || piDetailEntity.getValue() == null) { @@ -92,7 +92,7 @@ public class ThrInvProductsDlService { @Async - public void importProducrs(String genKey,String thirdSys, ErpOnhandRequest erpOnhandRequest) { + public void importProducrs(String genKey, String thirdSys, ErpOnhandRequest erpOnhandRequest) { BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSys); if (piDetailEntity == null || piDetailEntity.getValue() == null) { WebSocketServer.sendInfo("库存产品信息接口未设置！", "sid"); @@ -141,6 +141,11 @@ public class ThrInvProductsDlService { //选中导出 if (thrInvProductsExportRequest.getThrInvProductsEntities() != null && thrInvProductsExportRequest.getThrInvProductsEntities().size() > 0) { List thrInvProductsEntities = thrInvProductsExportRequest.getThrInvProductsEntities(); + + for (ThrInvProductsEntity thrInvProductsEntity : thrInvProductsEntities) { + thrInvProductsEntity.setInventoryCode(thrInvProductsEntity.getCode()); + thrInvProductsEntity.setInventoryName(thrInvProductsEntity.getName()); + } excelData.addAll(getRows(thrInvProductsEntities)); } else {//一键导出 //判断是否启用实时获取 @@ -258,7 +263,7 @@ public class ThrInvProductsDlService { } public List exportInvProducts(FilterThrInvProductsRequest filterThrInvProductsRequest) { - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", filterThrInvProductsRequest.getThirdSysFk()); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", filterThrInvProductsRequest.getThirdSys()); int page = 1; int limit = 100; List thrInvProductsEntities = new ArrayList<>(); @@ -292,6 +297,8 @@ public class ThrInvProductsDlService { item -> { ThrInvProductsEntity thrProductsEntity = new ThrInvProductsEntity(); BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setInventoryCode(item.getCode()); + thrProductsEntity.setInventoryName(item.getName()); return thrProductsEntity; } ).collect(Collectors.toList()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java index 49d2f4d1..5c209d9e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java @@ -13,7 +13,7 @@ public class FilterUdiUtils { public static UdiEntity getUdi(String data) { if (data != null && data.length() > 2) { - if (data.substring(0, 2).equals("MA")) { + if (data.substring(0, 2).toUpperCase().equals("MA")) { return getZGCUdi(data); } else if (data.substring(0, 2).equals("01")) { return getGS1Udi(data); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index d8ee15ef..4fb64358 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ # 本地环境 server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=123456 -#spring.datasource.password=root +#spring.datasource.password=123456 +spring.datasource.password=root server.servlet.context-path= logging.level.com.glxp.api.admin.dao=debug diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 2bc296b3..1185c9da 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -13,8 +13,17 @@ AND inventoryName LIKE concat(#{inventoryName},'%') - - AND thirdSysFk = #{thirdSysFk} + + AND inventoryName LIKE concat(#{inventoryName},'%') + + + AND spec LIKE concat(#{spec},'%') + + + AND registerCertNo LIKE concat(#{registerCertNo},'%') + + + AND manufactory = #{manufactory} ORDER BY updateTime DESC @@ -29,14 +38,14 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory ) values ( #{inventoryCode}, #{inventoryName}, #{count}, #{spec}, #{warehouseName}, #{warehouseCode}, #{registerCertNo}, #{manufacturingDate}, #{expirationDate}, - #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName},#{updateTime} + #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName},#{updateTime},#{manufactory} ) @@ -45,7 +54,7 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory ) values @@ -55,7 +64,7 @@ #{item.inventoryCode}, #{item.inventoryName}, #{item.count}, #{item.spec}, #{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo}, #{item.manufacturingDate}, #{item.expirationDate}, - #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName},#{item.updateTime} + #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName},#{item.updateTime},#{item.manufactory} ) @@ -86,7 +95,7 @@ spaceName=#{spaceName}, thirdSysFk=#{thirdSysFk}, updateTime=#{updateTime}, - + manufactory=#{manufactory}, WHERE id = #{id}