From 4854df1f7fd8005e580c3c1b5cfbb33fa3e5e284 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 31 Jan 2024 11:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/purchase/PurApplyController.java | 1 +
 src/main/resources/application-dev.yml                       | 2 +-
 .../resources/mybatis/mapper/purchase/PurApplyDetailDao.xml  | 2 +-
 src/main/resources/schemas/schema_v2.4.sql                   | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
index a61e137b5..99401ac70 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
@@ -109,6 +109,7 @@ public class PurApplyController {
         }
         if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) {
             for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) {
+                purApplyDetailEntity.setId(null);
                 purApplyDetailService.insert(purApplyDetailEntity);
             }
         }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b2df4abe2..96245d007 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_pt?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_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index e94bfd1bb..08c0de1ac 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -48,7 +48,7 @@
         order by pur_apply_detail.id desc
     </select>
 
-    <insert id="insert" keyProperty="id"
+    <insert id="insert" keyProperty="id" useGeneratedKeys="false"
             parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
         replace
                 INTO pur_apply_detail
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 112a71405..5e1ce336b 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -470,5 +470,10 @@ CALL Pro_Temp_ColumnWork('inv_stock_compare_detail', 'createTime', 'datetime', 1
 CALL Pro_Temp_ColumnWork('inv_stock_compare_detail', 'updateTime', 'datetime', 1);
 
 
+update basic_bussiness_type
+set inputSick = true
+WHERE inputSick is null;
+
+