From 3e6239f0a319044691e822456dac02b6e7f5cdae Mon Sep 17 00:00:00 2001 From: zhengyf Date: Mon, 25 Nov 2024 14:41:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A1=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=85=A5=E5=BA=93=EF=BC=8C=E7=BB=84=E8=A3=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8F=96=E5=85=B3=E5=8D=95=E6=97=B6=E9=97=B4=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F=E3=80=822?= =?UTF-8?q?=E3=80=81=E8=B0=83=E6=95=B4=E5=85=A5=E5=BA=93=EF=BC=8C=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E5=85=A5=E5=BA=93=EF=BC=8C=E8=B0=83=E6=95=B4=E5=87=BA?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=BE=97=E6=8A=A5=E9=94=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/adjust/AdjustInPluginInitializer.java | 6 +++++- .../lets/plugin/adjust/AdjustInZZPluginInitializer.java | 3 ++- .../lets/plugin/adjust/AdjustOutPluginInitializer.java | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index 74cc17a6..bc5044a3 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -298,7 +298,8 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { parentvo.setVnote(ofsHeader.getNote()); //dbilldate--单据日期--oms入库时间 create = ofsHeader.getCreated(); - modify = ofsHeader.getLastUpdated(); +// modify = ofsHeader.getLastUpdated(); + modify = ofsHeader.getClosedAt(); // parentvo.setDbilldate(StringUtils.substring(create, 0, 10)); parentvo.setDbilldate(StringUtils.substring(modify, 0, 10)); //coperatorid--制单人 @@ -313,6 +314,9 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { Assert.state(false, "根据调整入库单号：{}，查询调整单：{}，失败。不存在或不唯一。", ofsCode, ofsHeader.getRefOrderCode()); } String u8ReceiptType = ofsAdjustOrders.get(0).getHeader().getU8ReceiptType(); + if(u8ReceiptType==null){ + Assert.state(false,"调整单：{}，收发类别（入库类别）为空，请维护。",ofsAdjustOrders.get(0).getHeader().getCode()); + } if("0106".equals(u8ReceiptType)){//20240910：排除组装入库，单独做一个插件 continue; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index 12baef96..cfff25ea 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -308,7 +308,8 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { parentvo.setPk_corp(bdCorpEntity.getPkCorp()); //dbilldate 单据日期 create = ofsHeader.getCreated(); - modify = ofsHeader.getLastUpdated(); +// modify = ofsHeader.getLastUpdated(); + modify = ofsHeader.getClosedAt(); // parentvo.setDbilldate(StringUtils.substring(create, 0, 10)); parentvo.setDbilldate(StringUtils.substring(modify, 0, 10)); //coperatorid 制单人 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index 44efcf1e..dc2d9252 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -315,6 +315,9 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { Assert.state(false, "根据调整出库单号：{}，查询调整单：{}，失败。不存在或不唯一。", ofsCode, ofsHeader.getRefOrderCode()); } String u8ShipmentType = ofsAdjustOrders.get(0).getHeader().getU8ShipmentType();//出库类型 + if(u8ShipmentType==null){ + Assert.state(false,"调整单：{}，收发类别（出库类别）为空，请维护。",ofsAdjustOrders.get(0).getHeader().getCode()); + } if("0206".equals(u8ShipmentType)){//20240910：排除组装出库，不做处理 continue; }