From 4ffe9a46175e7b91a75ecb95a6e297ea1fdacd5e Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 5 Jul 2022 15:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=AB=E7=A0=81=E4=B8=8E?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BD=95=E5=85=A5=E4=B8=8D=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/admin/controller/inout/WareHouseController.java  | 8 ++++++++
 api-admin/src/main/resources/application-pro.properties   | 4 ++--
 api-admin/src/main/resources/application-test.properties  | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

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 88795b1..aea6fc3 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
@@ -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();
diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties
index 7a0a09b..db812f2 100644
--- a/api-admin/src/main/resources/application-pro.properties
+++ b/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=123456
+#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
diff --git a/api-admin/src/main/resources/application-test.properties b/api-admin/src/main/resources/application-test.properties
index 22a78fb..6d52915 100644
--- a/api-admin/src/main/resources/application-test.properties
+++ b/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