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; }