From b8b9b309c0976444eb4e5af84929ce246ce02ab7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 15 Jan 2026 13:32:49 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-15=20pda=E6=8B=86=E5=90=88=E7=BB=84?=
 =?UTF-8?q?=E6=89=98=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8B=86=E5=88=86=E6=97=B6?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=E4=BF=9D=E6=8C=81=E5=8E=9F?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=9A=84=EF=BC=8C=E6=9D=A5=E6=BA=90=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=B5=8B=E5=80=BC=E2=80=9C=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=8B=86=E5=88=86=E5=85=A5=E5=BA=93=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LabelSplitMergeServiceImpl.java           | 3 ++-
 .../mapper/labelSplitMerge/LabelSplitMergeMapper.xml       | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java b/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
index 689802a..00aef7d 100644
--- a/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/labelSplitMerge/service/impl/LabelSplitMergeServiceImpl.java
@@ -130,7 +130,7 @@ public class LabelSplitMergeServiceImpl extends ServiceImpl<LabelSplitMergeMappe
             insertParams.put("wdr", params.get("wdr"));
             insertParams.put("statusTb", params.get("statusTb"));
             insertParams.put("status", params.get("status"));
-            insertParams.put("firstInDate", new Date());
+            insertParams.put("firstInDate", params.get("firstInDate"));
             insertParams.put("latestInDate", new Date());
             insertParams.put("activeDate", new Date());
             insertParams.put("inQty", splitQuantity);
@@ -140,6 +140,7 @@ public class LabelSplitMergeServiceImpl extends ServiceImpl<LabelSplitMergeMappe
             insertParams.put("freezeFlag", params.get("freezeFlag"));
             insertParams.put("manufactureDate", params.get("manufactureDate"));
             insertParams.put("expiredDate", params.get("expiredDate"));
+            insertParams.put("orderref0", "标签拆分入库");
             insertParams.put("orderref1", params.get("orderref1"));
             insertParams.put("orderref2", params.get("orderref2"));
             insertParams.put("orderref3", params.get("orderref3"));
diff --git a/src/main/resources/mapper/labelSplitMerge/LabelSplitMergeMapper.xml b/src/main/resources/mapper/labelSplitMerge/LabelSplitMergeMapper.xml
index 76b0063..72144c0 100644
--- a/src/main/resources/mapper/labelSplitMerge/LabelSplitMergeMapper.xml
+++ b/src/main/resources/mapper/labelSplitMerge/LabelSplitMergeMapper.xml
@@ -23,7 +23,8 @@
             s.label_type as labelType,
             s.label_type_tb as labelTypeTb,
             s.wdr,
-            w.WareHouseName as warehouseName
+            w.WareHouseName as warehouseName,
+            s.first_in_date as firstInDate
         FROM inventory_stock s
         LEFT JOIN warehouse w ON s.warehouse_id = w.WareHouseID AND s.site = w.site
         WHERE s.roll_no = #{labelCode}
@@ -46,7 +47,7 @@
             warehouse_id,
             location_id,
             batch_no,
-           wdr,
+            wdr,
             status_tb,
             status,
             first_in_date,
@@ -59,6 +60,7 @@
             freeze_flag,
             manufacture_date,
             expired_date,
+            orderref0,
             orderref1,
             orderref2,
             orderref3
@@ -86,6 +88,7 @@
             #{params.freezeFlag},
             #{params.manufactureDate},
             #{params.expiredDate},
+            #{params.orderref0},
             #{params.orderref1},
             #{params.orderref2},
             #{params.orderref3}