diff --git a/ic/src/private/nc/bs/ic/m45/insert/rule/NoItemsDeliverMaterialRule.java b/ic/src/private/nc/bs/ic/m45/insert/rule/NoItemsDeliverMaterialRule.java index ae306b61..d87fbb45 100644 --- a/ic/src/private/nc/bs/ic/m45/insert/rule/NoItemsDeliverMaterialRule.java +++ b/ic/src/private/nc/bs/ic/m45/insert/rule/NoItemsDeliverMaterialRule.java @@ -49,7 +49,7 @@ import java.util.List; import java.util.Map; /** - * 精密铸造-根据采购入库进行无备料领料 + * 精密铸造-根据采购入库进行无备料领料-该方案已弃用 * * @author mzr * @date 2025/10/14 diff --git a/ic/src/private/nc/bs/ic/m4d/insert/InsertBP.java b/ic/src/private/nc/bs/ic/m4d/insert/InsertBP.java index 30d4ae25..2f3929c1 100644 --- a/ic/src/private/nc/bs/ic/m4d/insert/InsertBP.java +++ b/ic/src/private/nc/bs/ic/m4d/insert/InsertBP.java @@ -8,11 +8,7 @@ import nc.bs.ic.general.insert.rule.before.InsertBeforeEventRule; import nc.bs.ic.general.rule.after.AfterInsertRuleForRewriteSpecial; import nc.bs.ic.general.rule.after.AtpAfterUpdate; import nc.bs.ic.general.rule.before.CtplcustomeridCheck; -import nc.bs.ic.m4d.base.BPPlugInPoint; -import nc.bs.ic.m4d.base.MaterialOutCheckRule; -import nc.bs.ic.m4d.base.MaterialOutValueProcRule; -import nc.bs.ic.m4d.base.MaterialOutWarehouseAttriCheck; -import nc.bs.ic.m4d.base.PurchaseInDateCheck; +import nc.bs.ic.m4d.base.*; import nc.bs.ic.m4d.insert.rule.*; import nc.bs.ic.pub.base.ICAroundProcesser; import nc.bs.ic.pub.base.IInsertRuleProvider; @@ -108,7 +104,6 @@ public class InsertBP implements IInsertBP, //2025年6月13日09点38分 -- 物料档案基本页签启用项目辅助属性+库存组织未启用项目,采购入库单保存时(包含接口导入)清除行项目,材料出库单保存时(包含接口导入)清除行项目 processor.addBeforeRule(new MaterialOutProjectRule()); - processor.addBeforeRule(new MaterialOutBatchCodeRule()); } @Override diff --git a/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java b/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java index 0c0a429c..320dddd0 100644 --- a/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java +++ b/ic/src/private/nc/bs/ic/m4d/insert/rule/MaterialOutBatchCodeRule.java @@ -21,6 +21,7 @@ import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; +import nc.vo.pub.lang.UFDate; import nc.vo.pub.lang.UFDouble; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; @@ -32,7 +33,7 @@ import java.util.HashMap; import java.util.Map; /** - * 精密-材料出库新增--批次号赋值 + * 精密-材料出库新增--批次号赋值-该方案已弃用 * * @author mzr * @date 2025/10/26 @@ -88,6 +89,7 @@ public class MaterialOutBatchCodeRule extends ICRule { } // 判断仓库是否为WF001 if (warehouseId.equals(cwarehouseid)) { + UFDate dbilldate = headVO.getDbilldate(); IPickmQueryService service = NCLocator.getInstance().lookup(IPickmQueryService.class); for (MaterialOutBodyVO body : bodys) { // 备料计划表头主键 @@ -105,6 +107,11 @@ public class MaterialOutBatchCodeRule extends ICRule { body.setNnum(nshouldnum); // nassistnum 实发数量 body.setNassistnum(nshouldassistnum); + // 出库日期 + UFDate dbizdate = body.getDbizdate(); + if (dbizdate == null) { + body.setDbizdate(dbilldate); + } if (MMValueCheck.isNotEmpty(cpickmhid)) { AggPickmVO aggVO = service.querySingleBillByPk(cpickmhid); if (aggVO == null) { diff --git a/ic/src/private/nc/pubimpl/ic/m4d/mm55a3/action/PushSaveActionFor55A3.java b/ic/src/private/nc/pubimpl/ic/m4d/mm55a3/action/PushSaveActionFor55A3.java index a9ed319b..5096ff62 100644 --- a/ic/src/private/nc/pubimpl/ic/m4d/mm55a3/action/PushSaveActionFor55A3.java +++ b/ic/src/private/nc/pubimpl/ic/m4d/mm55a3/action/PushSaveActionFor55A3.java @@ -1,12 +1,6 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - package nc.pubimpl.ic.m4d.mm55a3.action; import nc.bs.ic.general.rule.before.IgnoreSafetyStockCheck; -import nc.bs.ic.general.rule.before.MaterialOutBillDateRule; import nc.bs.ic.general.rule.before.RowNoProcessForPushBill; import nc.bs.ic.m4d.base.ServicePluginPoint; import nc.bs.ic.m4d.insert.InsertBP; @@ -21,7 +15,6 @@ public class PushSaveActionFor55A3 { public MaterialOutVO[] pushSave(MaterialOutVO[] vos, boolean isFillNum) { ICAroundProcesser processor = new ICAroundProcesser(ServicePluginPoint.pushSaveFor55A3); - processor.addBeforeRule(new MaterialOutBillDateRule<>()); processor.addBeforeRule(new Push4DFor55A3BeforeProcess(isFillNum)); processor.addBeforeRule(new IgnoreSafetyStockCheck()); processor.addBeforeRule(new RowNoProcessForPushBill()); diff --git a/ic/src/public/nc/bs/ic/general/insert/InsertBPTemplate.java b/ic/src/public/nc/bs/ic/general/insert/InsertBPTemplate.java index cd34870d..9bb9d06e 100644 --- a/ic/src/public/nc/bs/ic/general/insert/InsertBPTemplate.java +++ b/ic/src/public/nc/bs/ic/general/insert/InsertBPTemplate.java @@ -132,8 +132,6 @@ public class InsertBPTemplate extends processor.addBeforeRule(new BillDefaultValueSetter()); //组织停用检查 processor.addBeforeRule(new ICStockOrgEnableCheckRule()); - // 精密-单据日期检查 - processor.addBeforeRule(new MaterialOutBillDateRule()); // 开关账检查 processor.addBeforeRule(new BaseAccountStatusCheck()); // 总数量,体积计算 diff --git a/ic/src/public/nc/bs/ic/general/rule/before/MaterialOutBillDateRule.java b/ic/src/public/nc/bs/ic/general/rule/before/MaterialOutBillDateRule.java index 2f191c6f..cc9c39a3 100644 --- a/ic/src/public/nc/bs/ic/general/rule/before/MaterialOutBillDateRule.java +++ b/ic/src/public/nc/bs/ic/general/rule/before/MaterialOutBillDateRule.java @@ -16,7 +16,7 @@ import nc.vo.pubapp.pattern.exception.ExceptionUtils; import java.util.Map; /** - * 精密-材料出库新增-单据日期赋值-启源领料 + * 精密-材料出库新增-单据日期赋值-启源领料-该方案已弃用 * * @author mzr * @date 2025/10/26