单据扫码与预验收录入不匹配

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -682,6 +682,14 @@ public class WareHouseController {
             if (invProductDetailEntity == null) {
                 return ResultVOUtils.error(500, "预验收库存未存在此产品！");
             } else {
+
+                if (StrUtil.isNotEmpty(invProductDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo())
+                        && !invProductDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) {
+                    return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+
+                }
+
+
                 if (StrUtil.isNotEmpty(orderId)) {//非首次添加
                     if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
                         WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();

api-admin/src/main/resources/application-pro.properties

@@ -3,8 +3,8 @@ server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+#spring.datasource.password=root
-#spring.datasource.password=123456
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10

api-admin/src/main/resources/application-test.properties

@@ -1,9 +1,9 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10