From ae81fe0a4b3368e072db02da8921750daab5de0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 18 Jul 2023 09:27:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b9dfaf4b8..3114d5c6a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 20 From 4a81812f88706bca0b88dcd171db572c3aa313b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Tue, 18 Jul 2023 09:51:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=E6=97=A0=E6=B3=95=E5=9C=A8?= =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/UdiRelevanceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index c963efb69..ba7c300bf 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -134,7 +134,7 @@ public class UdiRelevanceController extends BaseController { List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (temps != null && temps.size() > 0) { filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); - filterUdiRelRequest.setNameCode(null); +// filterUdiRelRequest.setNameCode(null);原为空 } } From a9d68d304893092f57ea8be23f81c26b3efbb716 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 18 Jul 2023 10:28:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=87=B3=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 2 +- src/main/resources/application-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index a7acdee02..e7a6b7bbd 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -901,7 +901,7 @@ public class IoOrderServiceImpl implements IoOrderService { ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction()); if (thrOrderUploadBustypesEntity == null) { log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); - return ResultVOUtils.error(500, billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); + continue; } if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) { log.error(billNo + ":" + "单据来源不允许自动提交"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eda745787..3ec5dc035 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: From f82de3c9d8c02a371b44fca0b16765f2edf127ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 18 Jul 2023 11:50:30 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eda745787..bf7be33a2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: From 60952f6168794c76e136aca3ccae4fd0efdf844e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Tue, 18 Jul 2023 15:42:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=90=9C=E7=B4=A2=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicCorpController.java | 2 +- .../inout/IoCodeTempController.java | 3 ++- .../com/glxp/api/dao/basic/BasicCorpDao.java | 1 + .../api/service/basic/BasicCorpService.java | 2 +- .../basic/impl/BasicCorpServiceImpl.java | 12 +++++++++++ .../mybatis/mapper/basic/BasicCorpDao.xml | 20 +++++++++++++++++++ 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 50b3e8d09..b91a85950 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -95,7 +95,7 @@ public class BasicCorpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicUnitMaintainEntities; - basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + basicUnitMaintainEntities = basicUnitMaintainService.filterList2(basicUnitMaintainFilterRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index a36b6c99b..b8a118b18 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -456,7 +456,8 @@ public class IoCodeTempController extends BaseController { long resultTime = expireTime - System.currentTimeMillis(); if (resultTime > 0) { - long time = resultTime / (24 * 60 * 60 * 1000); + long time = resultTime / ( 60 * 60 * 1000); +// long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?"); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index bc912dfa7..c553a099c 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -13,6 +13,7 @@ import java.util.List; @Mapper public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + List filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index 2dbeafe7b..db71d5e18 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -11,7 +11,7 @@ import java.util.List; public interface BasicCorpService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - + List filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity); boolean updateById(BasicCorpEntity basicCorpEntity); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 040db77bc..ccbb4fcb5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -36,7 +36,19 @@ public class BasicCorpServiceImpl implements BasicCorpService { List data = basicCorpDao.filterList(basicUnitMaintainFilterRequest); return data; } + @Override + public List filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { + if (basicUnitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + if (basicUnitMaintainFilterRequest.getPage() != null) { + int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + } + List data = basicCorpDao.filterList2(basicUnitMaintainFilterRequest); + return data; + } @Override public boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse) { thrUnitMaintainResponse.setUpdateTime(new Date()); diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 60a8a6149..21efc34a1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -56,6 +56,26 @@ order by updateTime desc + + + + + + +