保存审批

xh/sc/src/private/nc/bs/sc/pfxx/plugin/SCorderPfxxPlugin.java

@@ -1,23 +1,21 @@
 package nc.bs.sc.pfxx.plugin;
 
+import java.util.HashMap;
+
+import nc.bs.ecn.eco.pf.PfParameterUtil;
 import nc.bs.framework.common.NCLocator;
 import nc.bs.logging.Logger;
 import nc.itf.sc.m61.ISCOrderMaintain;
 import nc.itf.uap.pf.IPFBusiAction;
-import nc.itf.uap.pfxx.IPFxxEJBService;
-import nc.md.persist.framework.IMDPersistenceQueryService;
-import nc.vo.pfxx.util.FileUtils;
 import nc.vo.pfxx.util.PfxxPluginUtils;
 import nc.bs.pfxx.ISwapContext;
 import nc.vo.pfxx.auxiliary.AggxsysregisterVO;
 import nc.vo.pub.BusinessException;
-import nc.vo.pub.VOStatus;
-import nc.vo.pub.workflownote.WorkflownoteVO;
 import nc.vo.pubapp.pattern.pub.PubAppTool;
-import nc.vo.sc.m61.entity.SCOrderHeaderVO;
 import nc.vo.sc.m61.entity.SCOrderItemVO;
 import nc.vo.sc.m61.entity.SCOrderVO;
 import nc.vo.sc.m61.entity.context.SCOrderContxt;
+import nc.vo.util.CloneUtil;
 
 
 
@@ -67,14 +65,14 @@ public class SCorderPfxxPlugin extends nc.bs.pfxx.plugin.AbstractPfxxPlugin  {
  				scOrderItemVO.setStatus(2);
 			}
  			resvo.getParentVO().setStatus(2);
- 			//WorkflownoteVO Workflownote = new WorkflownoteVO();
- 			//IPFBusiAction ipf = NCLocator.getInstance().lookup(IPFBusiAction.class);
-			//ipf.processAction("SAVEBASE", "61", Workflownote, resvo, null, null);
  			ISCOrderMaintain is = NCLocator.getInstance().lookup(ISCOrderMaintain.class);
  			SCOrderVO[] scOrderVOs = is.save(new SCOrderVO[]{resvo},new SCOrderContxt(), null);
- 			IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
- 			service.processAction("APPROVE","61", null, scOrderVOs[0], null, null);
- 			System.out.println(1);
+ 			
+ 			
+ 			
+ 			HashMap<String, Object> pfparam = new HashMap<String, Object>(); // 该参数用于控制自动审批时按钮的审批状态 
+			pfparam.put(PfParameterUtil.ORIGIN_VO_PARAMETER, CloneUtil.deepClone(scOrderVOs)); 
+			NCLocator.getInstance().lookup(IPFBusiAction.class) .processBatch("APPROVE", "61",scOrderVOs, null, null, pfparam);
  		}
  		
  		//5.如果此单据已经导入过，请调用PfxxPluginUtils.checkBillCanBeUpdate(UfinterfaceVO swapContext)检查单据是否允许更新

xh/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java

@@ -0,0 +1,60 @@
+package nc.impl.sc.m61.action.approve;
+
+import nc.bs.pub.compiler.AbstractCompiler2;
+import nc.bs.sc.plugin.SCOrderPluginPoint;
+import nc.bs.scmpub.pf.PfParameterUtil;
+import nc.impl.pubapp.pattern.data.bill.BillUpdate;
+import nc.impl.pubapp.pattern.rule.processer.CompareAroundProcesser;
+import nc.impl.sc.m61.action.approve.rule.ApproveStatusChkRule;
+import nc.impl.sc.m61.action.approve.rule.SupplierFrozeChkRule;
+import nc.impl.sc.m61.action.approve.rule.UpdatePFlowInfoRule;
+import nc.itf.sc.reference.ic.ATPServices;
+import nc.vo.pubapp.pattern.exception.ExceptionUtils;
+import nc.vo.sc.m61.entity.SCOrderVO;
+import nc.vo.sc.m61.entity.context.SCOrderContxt;
+import nc.vo.scmpub.res.billtype.SCBillType;
+import org.apache.commons.lang.ArrayUtils;
+
+public class SCOrderApproveAction {
+	public SCOrderVO[] approve(SCOrderVO[] vos, SCOrderContxt contxt, AbstractCompiler2 script) {
+		if (ArrayUtils.isEmpty(vos)) {
+			return vos;
+		} else {
+			PfParameterUtil<SCOrderVO> util = new PfParameterUtil(script == null ? null : script.getPfParameterVO(),
+					vos);
+			SCOrderVO[] originBills = (SCOrderVO[]) util.getOrginBills();
+			SCOrderVO[] clientBills = (SCOrderVO[]) util.getClientFullInfoBill();
+			CompareAroundProcesser<SCOrderVO> prcr = new CompareAroundProcesser(SCOrderPluginPoint.APPROVE);
+			this.addRule(prcr);
+			prcr.before(clientBills, originBills);
+			if (null != script) {
+				try {
+					script.procFlowBacth(script.getPfParameterVO());
+				} catch (Exception var10) {
+					ExceptionUtils.wrappException(var10);
+				}
+			}
+
+			this.atpBeforeUpdate(clientBills);
+			prcr.after(clientBills, originBills);
+			BillUpdate<SCOrderVO> update = new BillUpdate();
+			SCOrderVO[] updateVOs = (SCOrderVO[]) update.update(clientBills, originBills);
+			this.atpAfterUpdate(updateVOs);
+			return updateVOs;
+		}
+	}
+
+	private void addRule(CompareAroundProcesser<SCOrderVO> prcr) {
+		prcr.addBeforeFinalRule(new ApproveStatusChkRule());
+		prcr.addBeforeFinalRule(new SupplierFrozeChkRule());
+		prcr.addAfterFinalRule(new UpdatePFlowInfoRule());
+	}
+
+	private void atpAfterUpdate(SCOrderVO[] updateVOs) {
+		ATPServices.modifyATPAfter(SCBillType.Order.getCode(), updateVOs);
+	}
+
+	private void atpBeforeUpdate(SCOrderVO[] clientBills) {
+		ATPServices.modifyATPBefore(SCBillType.Order.getCode(), clientBills);
+	}
+}

xh/so/src/private/nc/bs/mmpac/wr/pfxx/plugin/MMPacWrPfxxPlugin.java

@@ -0,0 +1,56 @@
+package nc.bs.mmpac.wr.pfxx.plugin;
+
+import nc.bs.framework.common.NCLocator;
+import nc.bs.pfxx.ISwapContext;
+import nc.bs.pfxx.plugin.AbstractPfxxPlugin;
+import nc.itf.mmpac.wr.IWrMaintainService;
+import nc.itf.uap.pf.IPFBusiAction;
+import nc.ui.fa.newasset.view.newasset_config;
+import nc.vo.mmpac.wr.entity.AggWrVO;
+import nc.vo.pfxx.auxiliary.AggxsysregisterVO;
+import nc.vo.pfxx.util.PfxxPluginUtils;
+import nc.vo.pub.AggregatedValueObject;
+import nc.vo.pub.BusinessException;
+import nc.vo.pub.CircularlyAccessibleValueObject;
+import nc.vo.pub.pf.workflow.IPFActionName;
+import nc.vo.pubapp.pattern.pub.PubAppTool;
+
+public class MMPacWrPfxxPlugin extends AbstractPfxxPlugin {
+	private IWrMaintainService service = null;
+
+	public IWrMaintainService getMaintainService() {
+		if (this.service == null) {
+			this.service = (IWrMaintainService) NCLocator.getInstance().lookup(IWrMaintainService.class);
+		}
+
+		return this.service;
+	}
+
+	protected Object processBill(Object vo, ISwapContext swapContext, AggxsysregisterVO aggxsysvo)
+			throws BusinessException {
+		AggregatedValueObject resvo = (AggregatedValueObject) vo;
+		String vopk = PfxxPluginUtils.queryBillPKBeforeSaveOrUpdate(swapContext.getBilltype(), swapContext.getDocID());
+		AggregatedValueObject returnVO = null;
+		IPFBusiAction iPFBusiAction = NCLocator.getInstance().lookup(IPFBusiAction.class);
+		if (PubAppTool.isNull(vopk)) {
+			resvo.getParentVO().setStatus(2);
+			CircularlyAccessibleValueObject[] arr$ = resvo.getChildrenVO();
+			int len$ = arr$.length;
+
+			for (int i$ = 0; i$ < len$; ++i$) {
+				CircularlyAccessibleValueObject bvo = arr$[i$];
+				bvo.setStatus(2);
+			}
+			returnVO = this.getMaintainService().insert(new AggWrVO[]{(AggWrVO) resvo})[0];
+			//2022-11-11 yaoy Éú²ú±¨¸æÉóÅú
+			returnVO.getParentVO().setAttributeValue("fbillstatus", 2);
+			this.getMaintainService().audit(new AggWrVO[] {(AggWrVO) returnVO});
+		} else {
+			returnVO = this.getMaintainService().update(new AggWrVO[]{(AggWrVO) resvo})[0];
+		}
+
+		vopk = returnVO.getParentVO().getPrimaryKey();
+		PfxxPluginUtils.addDocIDVsPKContrast(swapContext.getBilltype(), swapContext.getDocID(), vopk);
+		return vopk;
+	}
+}

xh/so/src/private/nc/bs/pu/m25/pfxx/M25PfxxPlugin.java

@@ -1,5 +1,6 @@
 package nc.bs.pu.m25.pfxx;
 
+import nc.bs.ecn.eco.pf.PfParameterUtil;
 import nc.bs.framework.common.NCLocator;
 import nc.bs.pu.m25.maintain.InvoiceSaveBP;
 import nc.impl.pu.m25.action.InvoiceDeleteAction;
@@ -7,9 +8,11 @@ import nc.impl.pu.m25.action.InvoiceInsertAction;
 import nc.impl.pubapp.pattern.data.bill.BillQuery;
 import nc.itf.scmpub.reference.uap.bd.vat.BuySellFlagEnum;
 import nc.itf.uap.pf.IPFBusiAction;
+import nc.ui.fa.newasset.view.newasset_config;
 import nc.vo.ml.NCLangRes4VoTransl;
 import nc.vo.pu.m25.entity.InvoiceHeaderVO;
 import nc.vo.pu.m25.entity.InvoiceItemVO;
+import nc.vo.pu.m25.entity.InvoiceSettleItemVO;
 import nc.vo.pu.m25.entity.InvoiceVO;
 import nc.vo.pu.m25.env.InvoiceUIToBSEnv;
 import nc.vo.pu.pfxx.plugins.AbstractPuPfxxPlugin;
@@ -19,6 +22,11 @@ import nc.vo.pub.lang.UFDouble;
 import nc.vo.pub.pf.workflow.IPFActionName;
 import nc.vo.pubapp.pattern.exception.ExceptionUtils;
 import nc.vo.scmf.pub.util.BatchNCBaseTypeUtils;
+import nc.vo.scmpub.res.billtype.POBillType;
+import nc.vo.util.CloneUtil;
+
+import java.util.HashMap;
+
 import org.apache.commons.lang.ArrayUtils;
 
 public class M25PfxxPlugin extends AbstractPuPfxxPlugin {
@@ -110,17 +118,17 @@ public class M25PfxxPlugin extends AbstractPuPfxxPlugin {
 		InvoiceHeaderVO orderHVO = (InvoiceHeaderVO) vo.getParentVO();
 		orderHVO.setFinvoicetype(0);
 		vo.setParentVO(orderHVO);
-		InvoiceVO  savedVos = (new InvoiceInsertAction()).insert(new InvoiceVO[]{(InvoiceVO) vo}, (InvoiceUIToBSEnv) null)[0];
-		
-		IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class); 
+		AggregatedValueObject[]  savedVos = (new InvoiceInsertAction()).insert(new InvoiceVO[]{(InvoiceVO) vo}, (InvoiceUIToBSEnv) null);
 		try {
-			 service.processAction(IPFActionName.APPROVE,
-				     "25", null, savedVos, null, null);
-			} catch (BusinessException e) {
-				// TODO 自动生成的 catch 块
-				e.printStackTrace();
-			}
-		return savedVos;
+			HashMap<String, Object> pfparam = new HashMap<String, Object>(); // 该参数用于控制自动审批时按钮的审批状态 
+			pfparam.put(PfParameterUtil.ORIGIN_VO_PARAMETER, CloneUtil.deepClone(savedVos)); 
+			//采购发票审批
+			NCLocator.getInstance().lookup(IPFBusiAction.class) .processBatch("APPROVE", "25",savedVos, null, null, pfparam);
+		} catch (BusinessException e) {
+			// TODO 自动生成的 catch 块
+			e.printStackTrace();
+		}
+		return savedVos[0];
 	}
 
 	protected AggregatedValueObject queryVOByPk(String voPk) {

xh/so/src/private/nc/pubimpl/so/m30/pfxx/M30PfxxPlugin.java

@@ -37,7 +37,6 @@ public class M30PfxxPlugin extends AbstractSOPfxxPlugin {
 		SaleOrderVO[] insertvo = new SaleOrderVO[]{(SaleOrderVO) vo};
 		InsertSaleOrderAction insertact = new InsertSaleOrderAction();
 		SaleOrderVO[] retvos = insertact.insert(insertvo);
-		InvocationInfoProxy.getInstance().setUserId(vo.getParentVO().getAttributeValue("approver").toString());
 	    IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 	    try {
 			service.processAction(IPFActionName.APPROVE,

xh/xh/src/private/nc/bs/arap/plugin/ArapExpPfxxPlugin.java

@@ -154,7 +154,7 @@ public class ArapExpPfxxPlugin<T extends BaseAggVO> extends AbstractPfxxPlugin {
 			ArapExpPfxxValidater.getInstance().validate(bill);
 			ArapVOUtils.validateVoCopyRed(bill);
 			
-			if (!head.getPk_billtype().equals("F3")||!head.getPk_billtype().equals("F2")) {
+			if (!head.getPk_billtype().equals("F3")&&!head.getPk_billtype().equals("F2")) {
 				head.setBillno((String) null);
 			}
 			
@@ -180,6 +180,7 @@ public class ArapExpPfxxPlugin<T extends BaseAggVO> extends AbstractPfxxPlugin {
 
 	private BaseAggVO insertBill(BaseAggVO bill) throws BusinessException {
 		BaseAggVO res = null;
+		IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 		if (bill.getHeadVO().getPk_billtype().equals("F0")) {
 			res = (AggReceivableBillVO) ArrayUtil.getFirstInArrays((Object[]) ((Object[]) NCPfServiceUtils.processBatch(
 					ArapFlowUtil.getCommitActionCode(bill.getHeadVO().getPk_org(), "F0"),
@@ -190,7 +191,6 @@ public class ArapExpPfxxPlugin<T extends BaseAggVO> extends AbstractPfxxPlugin {
 					ArapFlowUtil.getCommitActionCode(bill.getHeadVO().getPk_org(), "F1"),
 					bill.getHeadVO().getPk_billtype(), new AggPayableBillVO[]{(AggPayableBillVO) bill},
 					this.getUserObj(), new WorkflownoteVO())));
-			IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 			service.processAction(IPFActionName.APPROVE,
 	                "F1", null, res, null, null);
 		} else if (bill.getHeadVO().getPk_billtype().equals("F2")) {
@@ -198,12 +198,13 @@ public class ArapExpPfxxPlugin<T extends BaseAggVO> extends AbstractPfxxPlugin {
 					ArapFlowUtil.getCommitActionCode(bill.getHeadVO().getPk_org(), "F2"),
 					bill.getHeadVO().getPk_billtype(), new AggGatheringBillVO[]{(AggGatheringBillVO) bill},
 					this.getUserObj(), new WorkflownoteVO())));
+			service.processAction(IPFActionName.APPROVE,
+	                "F2", null, res, null, null);
 		} else if (bill.getHeadVO().getPk_billtype().equals("F3")) {
 			res = (AggPayBillVO) ArrayUtil.getFirstInArrays((Object[]) ((Object[]) NCPfServiceUtils.processBatch(
 					ArapFlowUtil.getCommitActionCode(bill.getHeadVO().getPk_org(), "F3"),
 					bill.getHeadVO().getPk_billtype(), new AggPayBillVO[]{(AggPayBillVO) bill}, this.getUserObj(),
 					new WorkflownoteVO())));
-			IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 			service.processAction(IPFActionName.APPROVE,
 	                "F3", null, res, null, null);
 		}
@@ -214,22 +215,24 @@ public class ArapExpPfxxPlugin<T extends BaseAggVO> extends AbstractPfxxPlugin {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private BaseAggVO insertInitBill(BaseAggVO bill) throws BusinessException {
 		BaseAggVO res = null;
+		IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 		if (bill.getHeadVO().getPk_billtype().equals("F0")) {
 			res = ((IArapInitRecService) NCLocator.getInstance().lookup(IArapInitRecService.class))
 					.save((AggReceivableBillVO) bill);
 		} else if (bill.getHeadVO().getPk_billtype().equals("F1")) {
 			res = ((IArapInitPayableService) NCLocator.getInstance().lookup(IArapInitPayableService.class))
 					.save((AggPayableBillVO) bill);
-			IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
 			service.processAction(IPFActionName.APPROVE,
 	                "F1", null, res, null, null);
 		} else if (bill.getHeadVO().getPk_billtype().equals("F2")) {
 			res = ((IArapInitGatheringService) NCLocator.getInstance().lookup(IArapInitGatheringService.class))
 					.save((AggGatheringBillVO) bill);
+			service.processAction(IPFActionName.APPROVE,
+	                "F2", null, res, null, null);
 		} else if (bill.getHeadVO().getPk_billtype().equals("F3")) {
 			res = ((IArapInitPaybillService) NCLocator.getInstance().lookup(IArapInitPaybillService.class))
 					.save((AggPayBillVO) bill);
-			IPFBusiAction service = NCLocator.getInstance().lookup(IPFBusiAction.class);
+			
 			service.processAction(IPFActionName.APPROVE,
 	                "F3", null, res, null, null);
 		}