diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java index c048671e..ee7d45b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java @@ -279,6 +279,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getBatchNo()) && StrUtil.isEmpty(myErpOrder.getBatchNo())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getBatchNo())) { + return null; } else { return myErpOrder.getCoName() + "批次号不匹配!"; } @@ -291,6 +293,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getProductDate()) && StrUtil.isEmpty(myErpOrder.getProductDate())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getProductDate())) { + return null; } else { return myErpOrder.getCoName() + "生产日期不匹配!"; } @@ -304,6 +308,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getExpireDate()) && StrUtil.isEmpty(myErpOrder.getExpireDate())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getExpireDate())) { + return null; } else { return myErpOrder.getCoName() + "失效日期不匹配!"; } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 8a813a25..54195b61 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,4 +1,4 @@ -server.port=9992 +server.port=9989 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root