From d9c5bc74124e3f29fbcfa42822f5686a5fc295e1 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 3 Jun 2026 15:53:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1521=20=E9=92=A2=E6=9E=84=E4=BB=B6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E6=A1=86=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=91=E5=92=8C=E3=80=90ECO=E3=80=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StructuralPackageOrderController.java | 1 + .../pojo/qo/PackageDeliverOrderSaveItemQO.java | 10 ++++++++++ ...eliverStructuralPackageOrderForPackageItemVO.java | 10 ++++++++++ .../pojo/vo/DeliverStructuralPackageOrderVO.java | 12 ++++++++++++ .../repository/entity/WmsStructuralPackageOrder.java | 10 ++++++++++ .../mapper/WmsStructuralPackageOrderMapper.xml | 6 ++++-- .../mapper/WmsStructuralPackageOrderTrayMapper.xml | 4 +++- 7 files changed, 50 insertions(+), 3 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index c268d230..7a638637 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -318,6 +318,7 @@ public class StructuralPackageOrderController extends BaseController { request.getItems().forEach(orderQO -> { WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO); order.setOrderNo(orderNo); + if (Objects.isNull(order.getId())) { order.setId(IdUtil.getSnowflakeNextId()); order.setCreateBy(UserUtil.getUserName()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java index 71cfa890..310f9b62 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java @@ -79,6 +79,16 @@ public class PackageDeliverOrderSaveItemQO { */ private String kzkri; + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; + @JsonIgnore private String key1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java index 8b7cbe11..b6691392 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java @@ -92,4 +92,14 @@ public class DeliverStructuralPackageOrderForPackageItemVO { * 该订单下包含的托盘号 */ private List trayNos; + + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java index 9410388f..513550d4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java @@ -169,4 +169,16 @@ public class DeliverStructuralPackageOrderVO { * 工厂编号 */ private String factoryNo; + + /** + * 版本号（从钢构件基础信息获取） + */ + @ExcelColumn(value = "版本", colIndex = 12) + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + @ExcelColumn(value = "ECO", colIndex = 13) + private String eco; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java index 55b6d2f8..fd45a3f2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java @@ -121,4 +121,14 @@ public class WmsStructuralPackageOrder implements Serializable { * 是否存在缺货零件 */ private Boolean quehuo; + + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml index e53167a3..516845aa 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml @@ -5,6 +5,7 @@ SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" - ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no" + ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -51,6 +52,7 @@ SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp."no" AS "package_no" ,sp."name" AS "package_desc",sp.drawing_no as "package_drawing_no",sp.remark as "package_remark",o.num - ,wh.no as "warehouse_no" + ,wh.no as "warehouse_no",o.version,o.eco FROM wms_structural_package_deliver_order pdo inner join wms_structural_package_deliver_order_map pdom on pdo.id=pdom.deliver_id LEFT JOIN wms_structural_package_order o on o.id=pdom.order_id diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml index 930afaea..3394c6ca 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml @@ -6,6 +6,7 @@ SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",o.*,m.no||wb."no" AS "workbench_code" ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no" ,sp."name" AS "package_desc",(SELECT COUNT(*) FROM wms_structural_package_order_tray ot WHERE ot.order_id=o.id) AS "trayNum",m."no" AS "model_no",'' as "tray_no",null as "tray",spdom.deliver_id + ,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -47,7 +48,7 @@ SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.order_id,o.*,m.no||wb."no" AS "workbench_code" ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no" ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,ot.id as "tray_id" - ,o.quehuo + ,o.quehuo,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -65,6 +66,7 @@ SELECT ot.id,ot.weight,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" ,sp.cate as "package_cate",sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.order_id ,ot.no as "tray_no",ot.tray,ot.station,ot.state,sp.version as "package_version",sp.drawing_no as "package_drawing_no" + ,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id From 732e87dd2c34a8d2950ff2baebab613eed0751d1 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 3 Jun 2026 16:05:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1522=20=E9=92=A2=E6=9E=84=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E8=80=81=E9=BC=A0=E5=9B=BE=E5=92=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=88=B6=E4=BD=9C=E4=B8=AD=E7=9A=84=E6=89=98=E7=9B=98?= =?UTF-8?q?=E8=80=81=E9=BC=A0=E5=9B=BE=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=90ECO=E3=80=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/StructuralPackageOrderController.java | 2 ++ .../src/main/resources/template/钢构件老鼠图.html | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 7a638637..a4770f66 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -563,6 +563,7 @@ public class StructuralPackageOrderController extends BaseController { .setSupplierName(trayVO.getSupplierName()) .setModelNos(trayVO.getModelNo()) .setVersion(trayVO.getPackageVersion()) + .setEco(trayVO.getEco()) .setWorkbenchCode(trayVO.getWorkbenchCode()) .setCate(trayVO.getPackageCate()) .setWeight(trayVO.getWeight()) @@ -2108,6 +2109,7 @@ public class StructuralPackageOrderController extends BaseController { .setSupplierName(trayVO.getSupplierName()) .setModelNos(trayVO.getModelNo()) .setVersion(trayVO.getPackageVersion()) + .setEco(trayVO.getEco()) .setWorkbenchCode(trayVO.getWorkbenchCode()) .setCate(trayVO.getPackageCate()) .setWeight(trayVO.getWeight()) diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html index 70bcb0a0..ea2ea47e 100644 --- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html +++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html @@ -109,8 +109,7 @@ 订单号：12255665451615 行号：1111 - - + ECO： 供应商：1111 From f407191fc86cad072e982e1d8a906c294a88e9b7 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 3 Jun 2026 16:51:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1531=20=E9=92=A2=E6=9E=84=E4=BB=B6=E9=80=81?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/钢构包送货单模版.xlsx | Bin 12169 -> 12343 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx index 1a3b2c324385ee69bcd877888b928432ac3fee08..f3519328284946bdf48cc6148e13bb6d9670d00f 100644 GIT binary patch delta 8724 zcmZvC1yoes_cq;KQqs~LlG0t$ARsLuICO^>iGcx;80j8LN4BLdaga`--HqO>sZq6?5 zJl4)`FSva`uL9#WG~0Ly!hR~x(H}`xLf;oh#_L^u;9#fMMzON{Ha5xN#V{M|6;q4M zfj7ESu|y`KLZ$O2wvnP)IBW53x~A}_12btV?P8oTL>U@Z1GgLlih7g&E6k&}`H^EV zKrc3ji(GKv=~EqpN2TK~xqVolNi8IlbeJvm!IP5)n4RD<869GgaJS`83-bqfmvs_Q<}FwD7=xP3@iTT<^O7j9XrW<-+AW?7wG5C3whDzrQ>`a^REmmH%2v zt0)N}vx!fSCX%H|tBJWtOP&v#V>wSEj}BbcoFi&uqQQ+omtI(xyrKLhtfhvGf=6

nD23p zA`oZiuL_@EN~Ffo*+xnp<0f0&Rcomf2@*z79!G3|A1C z`%rNjd&HYh-Yy(aoAI$rQ>d@Ar|pL%@kyx1zr}OmRqqbcS+`@f9STJqS{0KGsTzLx zz;sQ~tl+4^nENA9=xr`f1@YF@IRlx)hRkbX>Fd<=M3EbWSV|}iMFy)sNWf$p2LU0} z2)c_x2MoBa)Di~m7xjv>)|cB{mv$L^TQG*A+%oH%i1)0kt9>q`RMBJdlYr{&)#b4# znZ}!N*MZg&)s94F8AL&jgK=;^r@g5e^aQAStZ_!n9K*3*l}x<_2lAH})opAZY-t|o#=MIg{^bhCD zAKE}&)6{?5{E<#8b4_G$unC{cSy#)XIW=FnU&i2MDRmtjIWuw zIePi*wZ)gpGLfz9ku=L^=scJ8#^DOjPxhTCkr#Kt-ojCjPGAO$vk5UZ*Um~+HDf!H z0V8x$oPAT*Jwr|PK0byYdwrjCTa=#oH{S{Dw86KMeR1o}0sLIAX}o?IbW7A3M?;UV ze`=rG>WU;5qwLNtgUZGiW9o0Hfi|lBM4S*hf1kPIxygzydhU z3_P{UURRlp57k_kwAx>J-V)q?@zdyC8*|4U0F4fokgf(v`S0Y@>|Za`pHByT0aA~~ zTB%sSluMOaRJ2VU7p%NGigS8q;`0jo>31ECr4gTOj+*=>{{lf%S6!h18dW(4ZS4;* zHmof8=DD%iVLlgbR`@8f@0KuJFn}gCP_$NTOW>y1Qs`wWURL<>gODB-*G=Stv5z3v z^Uob+&a=+MO2ZgvIU^-Xx%z^lq(J}FV~23`D~rCE!VtB}l@ZH`x7;j-N+V8bX);2B z$W;_4eu)e7KZ>VlN-eaiXqt2@UR>lq9O5;Chne{(3D~o~Rf`6&B|`g+rr!7y2jw6= zI|~Y|ZK$Pq9i$>uqY#Xo(*@@yT9yt)#zMEER(7EienXh-NX73!#UEM%;sGecG|Z1s z#MC`{S{jmGAq`uDG*;jR>sTSkBW9m48()HB_Chew-(w~t7C^|+iHL*Z<_*MMOEmD? zb7pYR-H3zCklMFM$cqL<5aM8(BaRROJoRjqR~HEAvcw{0mVYg)VS#g8wi{YBi9K^yl-QA$rRE6#vBNQQ7K5mN-NX!M}N!ki=|OdIF1 zBA*dO>)T5H$ktv~G>%;I($W_Plt>&_jNK9|ykjrt7BsUl0F2)qYs zz%Qv8ULduHi^SpE@ZEyxfH8*_auvZqAedn#6;F!&yYzbEQ1UFldEb^G#qt z1~W@EswLGMXw>@r2?f0L1N@rlh%r)HtFY@e6CXy&V2sUcCObl3aWs^EMrK4wgz?YTQw=-h8tKc*0H#MzdDiK5PG!GM^{iiS_t5wshwCQQ`8!tDb-PGV}HG$$}*Vz|T~21XEQuK5 zT%ZXH@ref|O-@^`#W-$}6YCzBh-!Hw>?KK;O|Zn>>Ui0o+#gC4mLvCx;0=ca@_ve4 zL3r{F2v^$NYj7+ikX~lX9{u|lQK*TEPK)v zKj>ylp+prNY`a3~#hNUi69nO0Da{}ruZdI*O*U#_3h(_MS4Ju-GgN1*M&q@lnao$r zSp^Yc-k>mK@;I$y$cga2p#Zy+Y`zPZpeDuwl9gLnBW0dYVJElqo9-9>1J&f~JE($R zi%kxzH_%dm1xPTGwOZtn6t&g67)ET{nI7XikE|{wtH-izP)sq*MGRKkFDxuUN}lT< zlx>@tp0skFNR7HE1<49xoF&Qq=7n>+ znM8aH#=Y!cUy0+W-4cq#OvD>$RiS_gH3C<&TJR%6kKZ~H7L3=Cp}6oqnS%qDa(;C(ua!@T(fESwK5BW@)kyJ!%B9iC=t1$ zpdJ+UL4l77_QU^~?mx33_y$NSsk8sJ^5NBPTBXHhCx4>?G~8NNCi6G&Kojjf@{J1a z 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 B81VoA delta 8554 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 z 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 Date: Wed, 3 Jun 2026 18:07:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1551=20=E6=9D=A1=E7=A0=81=E5=88=B6=E4=BD=9C?= =?UTF-8?q?-=E9=92=A2=E7=BB=93=E6=9E=84=E9=A1=B5=E9=9D=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=88=86=E6=89=93=E5=8C=85=E5=92=8C=E6=9C=AA?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StructuralPackageOrderController.java | 22 ++++++++++++++++-- .../template/钢构包送货单模版.xlsx | Bin 12343 -> 12337 bytes .../vo/DeliverStructuralPackageOrderVO.java | 5 ++++ .../entity/WmsStructuralPackageOrder.java | 5 ++++ .../WmsStructuralPackageOrderTrayMapper.xml | 2 +- 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index a4770f66..f1c7ac21 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -323,6 +323,7 @@ public class StructuralPackageOrderController extends BaseController { order.setId(IdUtil.getSnowflakeNextId()); order.setCreateBy(UserUtil.getUserName()); order.setCreateTime(LocalDateTime.now()); + order.setState(OrderState.Unpackaged.getState()); // 初始化订单状态为未打包 ordersForAdd.add(order); } else { order.setUpdateBy(UserUtil.getUserName()); @@ -1071,8 +1072,13 @@ public class StructuralPackageOrderController extends BaseController { info.put("today", DateTimeUtil.format(LocalDate.now())); List datas = structuralPackageOrderService.getInfoByDeliverOrderNo(deliverOrder.getNo()); datas.forEach(it -> { + // 只统计已打包的托盘数量（状态为1：已打包、2：在途、3：已收货） it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery() .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId()) + .in(WmsStructuralPackageOrderTray::getState, + OrderState.Packaged.getState(), + OrderState.InTransit.getState(), + OrderState.Received.getState()) .count())); }); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); @@ -1818,7 +1824,13 @@ public class StructuralPackageOrderController extends BaseController { // 10. 保存二维码扫描记录 saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1); - // 11. 构建返回结果 + // 11. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包） + structuralPackageOrderService.lambdaUpdate() + .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState()) + .eq(WmsStructuralPackageOrder::getId, orderId) + .update(); + + // 12. 构建返回结果 PackTraySubmitResultVO result = new PackTraySubmitResultVO(); result.setHasDiff(false); result.setDiffList(new ArrayList<>()); @@ -1981,7 +1993,13 @@ public class StructuralPackageOrderController extends BaseController { // 8. 保存二维码扫描记录 saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1); - // 9. 构建返回结果 + // 9. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包） + structuralPackageOrderService.lambdaUpdate() + .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState()) + .eq(WmsStructuralPackageOrder::getId, orderId) + .update(); + + // 10. 构建返回结果 PackTraySubmitWithDiffVO result = new PackTraySubmitWithDiffVO(); result.setOrderId(request.getOrderId()); diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx index f3519328284946bdf48cc6148e13bb6d9670d00f..2b1f7508d5b31c2899e6839c09b1019ce4c31b2e 100644 GIT binary patch delta 3719 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 Yz=ZfrjTmT-K_E`r%S20sM~*)FKLehxSO5S3 delta 3771 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 - and exists (select 1 from wms_structural_package_order_tray ot where ot.order_id=o.id and ot.state=#{request.state}) + and o.state=#{request.state} and o.order_no=#{request.orderNo} From 20ab09b429d18e1c991a2a0c669c7a97f1f7042a Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 4 Jun 2026 09:10:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1551=20=E6=9D=A1=E7=A0=81=E5=88=B6=E4=BD=9C?= =?UTF-8?q?-=E9=92=A2=E7=BB=93=E6=9E=84=E9=A1=B5=E9=9D=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=88=86=E6=89=93=E5=8C=85=E5=92=8C=E6=9C=AA?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/vo/DeliverStructuralPackageOrderVO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java index 845b0014..b1453dcd 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java @@ -182,8 +182,8 @@ public class DeliverStructuralPackageOrderVO { @ExcelColumn(value = "ECO", colIndex = 13) private String eco; - /** - * 状态，0：未打包；1：已打包；2-在途；3-已收货 - */ - private Short state; +// /** +// * 状态，0：未打包；1：已打包；2-在途；3-已收货 +// */ +// private Short state; } From b929add353cfc721e160781db429417b93a67014 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 4 Jun 2026 09:10:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1523=20=E9=92=A2=E6=9E=84=E5=8C=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E7=9A=84=E3=80=90=E6=9C=BA=E5=9E=8B=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E3=80=91=E5=8F=96=E6=B6=88=E5=BF=85=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java index 3117bfd3..e79be61b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java @@ -39,7 +39,7 @@ public class PackageAddQO { /** * 机型编号 */ - @NotEmpty +// @NotEmpty private List modelIds; /**