From e9a45fe507656f963c72a7be2e18e2ed94302b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Fri, 13 Dec 2024 14:39:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WmsOutPlanServiceImpl.java   |  4 ++++
 .../stl/mapper/InventoryAdjustmentMapper.java | 13 ++++++++++-
 .../mapper/stl/InventoryAdjustmentMapper.xml  | 22 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
index b0f8344..b15a8d0 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
@@ -6,6 +6,7 @@ import com.ktg.common.utils.StringUtils;
 import com.ktg.mes.md.domain.*;
 import com.ktg.mes.md.mapper.*;
 import com.ktg.mes.md.service.IWmsOutPlanService;
+import com.ktg.mes.stl.mapper.InventoryAdjustmentMapper;
 import com.ktg.mes.wm.domain.WmStorageArea;
 import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
 import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
@@ -57,6 +58,9 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
     @Autowired
     private WmStorageAreaMapper wmStorageAreaMapper;
 
+    @Autowired
+    private InventoryAdjustmentMapper inventoryAdjustmentMapper;
+
     /**
      * 查询出库计划管理
      *
diff --git a/ktg-mes/src/main/java/com/ktg/mes/stl/mapper/InventoryAdjustmentMapper.java b/ktg-mes/src/main/java/com/ktg/mes/stl/mapper/InventoryAdjustmentMapper.java
index 709f763..0b18a09 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/stl/mapper/InventoryAdjustmentMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/stl/mapper/InventoryAdjustmentMapper.java
@@ -1,7 +1,18 @@
 package com.ktg.mes.stl.mapper;
 
+import com.ktg.common.annotation.DataSource;
+import com.ktg.common.enums.DataSourceType;
+import com.ktg.mes.md.domain.AP0AD;
+import com.ktg.mes.stl.domain.InventoryAdjustment;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
-public class InventoryAdjustmentMapper {
+public interface InventoryAdjustmentMapper {
+    @DataSource(DataSourceType.SQLSERVER)
+    List<InventoryAdjustment> selectOutNewData();
+
+    @DataSource(DataSourceType.SQLSERVER)
+    int updateOutDataToOld(InventoryAdjustment inventoryAdjustment);
 }
diff --git a/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml b/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
index 3ccb357..7905ce0 100644
--- a/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
@@ -69,10 +69,30 @@
                USER02,
                DATE01,
                DATE02,
-        from AP0AA
+        from AP0AD
     </sql>
 
     <select id="selectList" resultMap="InventoryAdjustmentResult">
         <include refid="InventoryAdjustmentSelectAllCol"/>
     </select>
+
+    <select id="selectOutNewData" resultMap="InventoryAdjustmentResult">
+        <include refid="InventoryAdjustmentSelectAllCol"/>
+        where UDF02 != 'ED'
+        AND AD001 IS NOT NULL
+        AND AD002 IS NOT NULL
+        AND AD003 IS NOT NULL
+        AND AD004 IS NOT NULL
+        AND AD008 > 0
+        AND AD011 IS NOT NULL
+    </select>
+
+    <update id="updateOutDataToOld">
+        update AP0AD
+        set UDF02 = 'ED'
+        where AD001 = #{singetsu}
+          AND AD002 = #{oddNumber}
+          AND AD003 = #{billDate}
+          AND AD004 = #{serialNumber}
+    </update>
 </mapper>
\ No newline at end of file

From c3587c2b7e603eb3098595f8b0cf3dcf0c772811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Fri, 13 Dec 2024 14:42:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml b/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
index 7905ce0..5e2e8fa 100644
--- a/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/stl/InventoryAdjustmentMapper.xml
@@ -68,7 +68,7 @@
                USER01,
                USER02,
                DATE01,
-               DATE02,
+               DATE02
         from AP0AD
     </sql>