From 540b29553cbd3cfa13789fbb6cb1848e00808f40 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 16 Dec 2024 15:37:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=A5=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swms/server/model/shipping/MasterBOL.java | 9 ++ .../server/model/shipping/masterBOL.hbm.xml | 3 + .../origen/shipping/maintainMasterBolPage.xml | 2 + .../server/model/shipping/MasterBOL.class | Bin 11839 -> 0 bytes .../server/model/shipping/masterBOL.hbm.xml | 134 ------------------ .../origen/shipping/maintainMasterBolPage.xml | 57 -------- 6 files changed, 14 insertions(+), 191 deletions(-) delete mode 100644 target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class delete mode 100644 target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/masterBOL.hbm.xml delete mode 100644 target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml diff --git a/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java b/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java index a7f9e83..cf4d02a 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java +++ b/src/main/java/com/dev/swms/server/model/shipping/MasterBOL.java @@ -136,8 +136,17 @@ public class MasterBOL extends Entity { private Set pickTickets = new HashSet(); + //工单个数 + private double gdQty; + public double getGdQty() { + return gdQty; + } + + public void setGdQty(double gdQty) { + this.gdQty = gdQty; + } public Set getPickTickets() { return pickTickets; diff --git a/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml index d395e68..c92c853 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/shipping/masterBOL.hbm.xml @@ -124,6 +124,9 @@ + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml index bb54814..a2725b9 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml @@ -11,6 +11,7 @@ masterBOL.id, masterBOL.code, CAST(masterBOL.orderQuantity as integer), + CAST(masterBOL.gdQty as integer), masterBOL.status, masterBOL.updateTime FROM MasterBOL masterBOL @@ -35,6 +36,7 @@ + diff --git a/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class b/target/nzwms/WEB-INF/classes/com/dev/swms/server/model/shipping/MasterBOL.class deleted file mode 100644 index 5cf8d6b36be5765c8a0260dba30a3bb92f310cbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11839 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 - - - - - - wms_masterBOL - START WITH 1000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml b/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml deleted file mode 100644 index bb54814..0000000 --- a/target/nzwms/WEB-INF/classes/config/origen/shipping/maintainMasterBolPage.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - = {order.beginDate} ~/ - /~order.endDate: AND trunc(masterBOL.updateTime) <= {order.endDate} ~/ - /~masterBOL.company.id: AND masterBOL.company.id = {masterBOL.company.id} ~/ - order by masterBOL.id desc ]]> - - - - - - - - - - - - - - - - - - - - - - - -