2026-01-23

收货入库和拣货出库页面增加备注

src/main/java/com/gaotao/modules/outboundNotification/entity/OutboundNotificationDetailEntity.java

@@ -27,4 +27,5 @@ public class OutboundNotificationDetailEntity extends QueryPage {
     private String orderref01;
     private String orderref02;
     private String orderref03;
+    private String remark;
 }

src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml

@@ -73,7 +73,8 @@
         a.related_order_no,
         a.related_order_line_no,
         a.actual_in_qty as actualStockInQty,
-        a.roll_no
+        a.roll_no,
+        a.remark
         FROM inbound_notification_detail as a
         left join WareHouse as b on a.site = b.site and a.bu_no = b.bu_no and a.in_warehouse = b.WareHouseID
         left join um as c on a.site = c.site and a.unit = c.UMID
@@ -155,6 +156,12 @@
             WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.inWarehouse}
         </foreach>
         ELSE in_warehouse
+        END,
+        remark = CASE
+        <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
+            WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.remark}
+        </foreach>
+        ELSE remark
         END
         WHERE site = #{list[0].site} AND bu_no = #{list[0].buNo} AND order_no = #{list[0].orderNo}
         AND (

src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml

@@ -25,7 +25,8 @@
         a.related_order_no,
         a.related_order_line_no,
         a.actual_out_qty as actualStockOutQty,
-        a.orderref03
+        a.orderref03,
+        a.remark
         FROM outbound_notification_detail as a
         left join WareHouse as b on a.site = b.site and a.bu_no = b.bu_no and a.out_warehouse = b.WareHouseID
         left join um as c on a.site = c.site and a.unit = c.UMID
@@ -164,6 +165,12 @@
             WHEN part_no = #{item.partNo} THEN #{item.relatedOrderLineNo}
         </foreach>
         ELSE related_order_line_no
+        END,
+        remark = CASE
+        <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
+            WHEN part_no = #{item.partNo} THEN #{item.remark}
+        </foreach>
+        ELSE remark
         END
         WHERE part_no IN
         <foreach item="item" index="index" collection="list" open="(" separator="," close=")">