diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxesDto.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxesDto.java
index c5797c2..67f989d 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxesDto.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveBoxesDto.java
@@ -80,6 +80,11 @@ public class SoReceiveBoxesDto {
*/
private String wareHouseID;
+ /**
+ * 标准装箱数量
+ */
+ private Integer stdPackingQty;
+
public Integer getId() {
return id;
}
@@ -199,4 +204,12 @@ public class SoReceiveBoxesDto {
public void setBuNo(String buNo) {
this.buNo = buNo;
}
+
+ public Integer getStdPackingQty() {
+ return stdPackingQty;
+ }
+
+ public void setStdPackingQty(Integer stdPackingQty) {
+ this.stdPackingQty = stdPackingQty;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
index cd8b40c..da1f351 100644
--- a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
+++ b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java
@@ -31,4 +31,5 @@ public class OutboundNotificationHeadVo extends OutboundNotificationHeadEntity {
private Double rollQty; // 已扫描数量
private Double unScanQty; // 未扫描数量
private Double availableStock; // 可用库存
+ private Double stdPackingQty; // 标准装箱数量
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
index ad419c5..c7768d6 100644
--- a/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
+++ b/src/main/resources/mapper/boxManage/BoxForNotificationMapper.xml
@@ -51,9 +51,23 @@
@@ -332,7 +346,8 @@
THEN ROUND(b.required_qty - ISNULL(SUM(e.roll_qty), 0), 3)
ELSE 0
END as unScanQty ,
- ISNULL(SUM(i.qty_on_hand), 0) as availableStock
+ ISNULL(SUM(i.qty_on_hand), 0) as availableStock,
+ b.std_packing_qty
FROM outbound_notification_head a
LEFT JOIN Customer c ON a.site = c.site AND a.customer_id = c.CustomerID
LEFT JOIN outbound_notification_detail b ON a.site = b.site AND a.bu_no = b.bu_no AND a.order_no = b.order_no
@@ -379,7 +394,7 @@
a.archived_by, a.archived_date, a.orderref1, a.orderref2, a.orderref3, a.orderref4, a.orderref5,
a.order_date, a.close_flag, a.out_warehouse, a.customer_order_no, a.show_in_query_flag,
b.part_no, b.part_desc, b.unit, b.required_qty, b.out_warehouse, b.out_batch_no, b.order_qty,
- b.related_order_no, b.related_order_line_no
+ b.related_order_no, b.related_order_line_no, b.std_packing_qty
ORDER BY a.created_date DESC, b.part_no