无备料领料开发方案弃用-去掉BP中的规则调用

This commit is contained in:
mzr 2025-11-01 11:03:26 +08:00
parent dacd990975
commit 030dcc1f09
6 changed files with 11 additions and 18 deletions

View File

@ -49,7 +49,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 精密铸造-根据采购入库进行无备料领料 * 精密铸造-根据采购入库进行无备料领料-该方案已弃用
* *
* @author mzr * @author mzr
* @date 2025/10/14 * @date 2025/10/14

View File

@ -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.AfterInsertRuleForRewriteSpecial;
import nc.bs.ic.general.rule.after.AtpAfterUpdate; import nc.bs.ic.general.rule.after.AtpAfterUpdate;
import nc.bs.ic.general.rule.before.CtplcustomeridCheck; import nc.bs.ic.general.rule.before.CtplcustomeridCheck;
import nc.bs.ic.m4d.base.BPPlugInPoint; import nc.bs.ic.m4d.base.*;
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.insert.rule.*; import nc.bs.ic.m4d.insert.rule.*;
import nc.bs.ic.pub.base.ICAroundProcesser; import nc.bs.ic.pub.base.ICAroundProcesser;
import nc.bs.ic.pub.base.IInsertRuleProvider; import nc.bs.ic.pub.base.IInsertRuleProvider;
@ -108,7 +104,6 @@ public class InsertBP implements IInsertBP<MaterialOutVO>,
//2025年6月13日09点38分 -- 物料档案基本页签启用项目辅助属性+库存组织未启用项目采购入库单保存时包含接口导入清除行项目材料出库单保存时包含接口导入清除行项目 //2025年6月13日09点38分 -- 物料档案基本页签启用项目辅助属性+库存组织未启用项目采购入库单保存时包含接口导入清除行项目材料出库单保存时包含接口导入清除行项目
processor.addBeforeRule(new MaterialOutProjectRule()); processor.addBeforeRule(new MaterialOutProjectRule());
processor.addBeforeRule(new MaterialOutBatchCodeRule());
} }
@Override @Override

View File

@ -21,6 +21,7 @@ import nc.vo.mmpac.pickm.entity.AggPickmVO;
import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO;
import nc.vo.org.StockOrgVO; import nc.vo.org.StockOrgVO;
import nc.vo.pub.BusinessException; import nc.vo.pub.BusinessException;
import nc.vo.pub.lang.UFDate;
import nc.vo.pub.lang.UFDouble; import nc.vo.pub.lang.UFDouble;
import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.exception.ExceptionUtils;
import nc.vo.pubapp.pattern.pub.SqlBuilder; import nc.vo.pubapp.pattern.pub.SqlBuilder;
@ -32,7 +33,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* 精密-材料出库新增--批次号赋值 * 精密-材料出库新增--批次号赋值-该方案已弃用
* *
* @author mzr * @author mzr
* @date 2025/10/26 * @date 2025/10/26
@ -88,6 +89,7 @@ public class MaterialOutBatchCodeRule extends ICRule<MaterialOutVO> {
} }
// 判断仓库是否为WF001 // 判断仓库是否为WF001
if (warehouseId.equals(cwarehouseid)) { if (warehouseId.equals(cwarehouseid)) {
UFDate dbilldate = headVO.getDbilldate();
IPickmQueryService service = NCLocator.getInstance().lookup(IPickmQueryService.class); IPickmQueryService service = NCLocator.getInstance().lookup(IPickmQueryService.class);
for (MaterialOutBodyVO body : bodys) { for (MaterialOutBodyVO body : bodys) {
// 备料计划表头主键 // 备料计划表头主键
@ -105,6 +107,11 @@ public class MaterialOutBatchCodeRule extends ICRule<MaterialOutVO> {
body.setNnum(nshouldnum); body.setNnum(nshouldnum);
// nassistnum 实发数量 // nassistnum 实发数量
body.setNassistnum(nshouldassistnum); body.setNassistnum(nshouldassistnum);
// 出库日期
UFDate dbizdate = body.getDbizdate();
if (dbizdate == null) {
body.setDbizdate(dbilldate);
}
if (MMValueCheck.isNotEmpty(cpickmhid)) { if (MMValueCheck.isNotEmpty(cpickmhid)) {
AggPickmVO aggVO = service.querySingleBillByPk(cpickmhid); AggPickmVO aggVO = service.querySingleBillByPk(cpickmhid);
if (aggVO == null) { if (aggVO == null) {

View File

@ -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; package nc.pubimpl.ic.m4d.mm55a3.action;
import nc.bs.ic.general.rule.before.IgnoreSafetyStockCheck; 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.general.rule.before.RowNoProcessForPushBill;
import nc.bs.ic.m4d.base.ServicePluginPoint; import nc.bs.ic.m4d.base.ServicePluginPoint;
import nc.bs.ic.m4d.insert.InsertBP; import nc.bs.ic.m4d.insert.InsertBP;
@ -21,7 +15,6 @@ public class PushSaveActionFor55A3 {
public MaterialOutVO[] pushSave(MaterialOutVO[] vos, boolean isFillNum) { public MaterialOutVO[] pushSave(MaterialOutVO[] vos, boolean isFillNum) {
ICAroundProcesser<MaterialOutVO> processor = new ICAroundProcesser(ServicePluginPoint.pushSaveFor55A3); ICAroundProcesser<MaterialOutVO> processor = new ICAroundProcesser(ServicePluginPoint.pushSaveFor55A3);
processor.addBeforeRule(new MaterialOutBillDateRule<>());
processor.addBeforeRule(new Push4DFor55A3BeforeProcess(isFillNum)); processor.addBeforeRule(new Push4DFor55A3BeforeProcess(isFillNum));
processor.addBeforeRule(new IgnoreSafetyStockCheck()); processor.addBeforeRule(new IgnoreSafetyStockCheck());
processor.addBeforeRule(new RowNoProcessForPushBill()); processor.addBeforeRule(new RowNoProcessForPushBill());

View File

@ -132,8 +132,6 @@ public class InsertBPTemplate<T extends ICBillVO> extends
processor.addBeforeRule(new BillDefaultValueSetter<T>()); processor.addBeforeRule(new BillDefaultValueSetter<T>());
//组织停用检查 //组织停用检查
processor.addBeforeRule(new ICStockOrgEnableCheckRule<T>()); processor.addBeforeRule(new ICStockOrgEnableCheckRule<T>());
// 精密-单据日期检查
processor.addBeforeRule(new MaterialOutBillDateRule<T>());
// 开关账检查 // 开关账检查
processor.addBeforeRule(new BaseAccountStatusCheck<T>()); processor.addBeforeRule(new BaseAccountStatusCheck<T>());
// 总数量体积计算 // 总数量体积计算

View File

@ -16,7 +16,7 @@ import nc.vo.pubapp.pattern.exception.ExceptionUtils;
import java.util.Map; import java.util.Map;
/** /**
* 精密-材料出库新增-单据日期赋值-启源领料 * 精密-材料出库新增-单据日期赋值-启源领料-该方案已弃用
* *
* @author mzr * @author mzr
* @date 2025/10/26 * @date 2025/10/26