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 0aad9c8f..acc113ca 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 @@ -39,6 +39,14 @@ import java.util.Date; import java.util.List; import java.util.concurrent.locks.ReentrantLock; +/** + * OFS调整入库--->U8C其它入库 + * 排除(U8_RECEIPT_TYPE):组装入库 + * U8入库类型(U8_RECEIPT_TYPE) + * U8_RECEIPT_TYPE 0106 组装入库 + * + */ + public class AdjustInPluginInitializer extends PluginBaseEntity { Logger logger = LoggerFactory.getLogger(AdjustInPluginInitializer.class); @@ -293,12 +301,15 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { //审核时间dauditdate parentvo.setDauditdate(StringUtils.substring(format, 0, 10)); - //cdispatcherid--收发类别 + //cdispatcherid--收发类别, List ofsAdjustOrders = queryOfsAdjustOrders(ofsHeader.getRefOrderCode()); if (ofsAdjustOrders.size() != 1) { Assert.state(false, "根据调整入库单号:{},查询调整单:{},失败。不存在或不唯一。", ofsCode, ofsHeader.getRefOrderCode()); } String u8ReceiptType = ofsAdjustOrders.get(0).getHeader().getU8ReceiptType(); + if("0106".equals(u8ReceiptType)){//20240910:排除组装入库,单独做一个插件 + continue; + } // BdRdclEntity bdRdclEntity = new BdRdclEntity(); // bdRdclEntity.setRdname("调整入库"); // bdRdclEntity.setDr(0); 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 6a57018f..0eb30c8e 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 @@ -47,6 +47,12 @@ import java.util.Date; import java.util.List; import java.util.concurrent.locks.ReentrantLock; +/** + * 丽知:OFS调整出库--->U8C其它出库 + * 排除(U8_SHIPMENT_TYPE):组装出库 + * U8_RECEIPT_TYPE 0106 组装入库 + * U8出库类型(U8_SHIPMENT_TYPE) + */ public class AdjustOutPluginInitializer extends PluginBaseEntity { Logger logger = LoggerFactory.getLogger(AdjustOutPluginInitializer.class); @@ -302,6 +308,9 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { Assert.state(false, "根据调整出库单号:{},查询调整单:{},失败。不存在或不唯一。", ofsCode, ofsHeader.getRefOrderCode()); } String u8ShipmentType = ofsAdjustOrders.get(0).getHeader().getU8ShipmentType();//出库类型 + if("0206".equals(u8ShipmentType)){//20240910:排除组装出库,不做处理 + continue; + } // BdRdclEntity bdRdclEntity = new BdRdclEntity(); // bdRdclEntity.setRdname("调整出库");