2026-01-15

pda拆合组托功能，拆分时入库日期保持原标签的，来源单据类型赋值“标签拆分入库”

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"));

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}