销售合同生效修改

ypff/ypff/src/private/nc/bs/yp/impl/ValidateMaintainImpl.java

@@ -14,6 +14,7 @@ import nc.bs.framework.common.NCLocator;
 import nc.bs.framework.server.ISecurityTokenCallback;
 import nc.bs.servlet.service.BaseServlet;
 import nc.bs.yp.plugin.GetBaseDAOUtil;
+import nc.itf.ct.saledaily.ISaledailyApprove;
 import nc.itf.uap.pf.IPFBusiAction;
 import nc.log.NcLog;
 import nc.md.persist.framework.IMDPersistenceQueryService;
@@ -67,35 +68,64 @@ public class ValidateMaintainImpl extends BaseServlet implements IHttpServletAda
 		//指定集团pk
 		InvocationInfoProxy.getInstance().setGroupId(GetBaseDAOUtil.getGroup(json.getString("groupCode")).getPk_group());
 		NCLocator.getInstance().lookup(ISecurityTokenCallback.class).token("NCSystem".getBytes(),"pfxx".getBytes());
+		ISaledailyApprove isaapprove=(ISaledailyApprove) NCLocator.getInstance().lookup(ISaledailyApprove.class.getName());
 		//组织
 		SalesOrgVO salesOrgVO = GetBaseDAOUtil.getSalesOrg(json.getString("pk_org"));
 		//根据唯一标识取到AggVO
 		AggCtSaleVO aggCtSaleVO = (AggCtSaleVO) service.queryBillOfNCObjectByPKWithDR(AggCtSaleVO.class,GetBaseDAOUtil.GetVOID("ct_sale",json.getString("vbillcode")),true).getContainmentObject();
-		CtSaleExecVO[] ctSaleExecArrVO = new CtSaleExecVO[aggCtSaleVO.getChildren(CtSaleExecVO.class).length+1];
-		for (int i = 0; i < aggCtSaleVO.getChildren(CtSaleExecVO.class).length; i++) {
-			ctSaleExecArrVO[i] = (CtSaleExecVO) aggCtSaleVO.getChildren(CtSaleExecVO.class)[i];
-		}
-		CtSaleExecVO  ctSaleExecVO = new CtSaleExecVO();
-		//集团
-		ctSaleExecVO.setPk_group(aggCtSaleVO.getParentVO().getPk_group());
-		//原始组织
-		ctSaleExecVO.setPk_org(salesOrgVO.getPk_org());
-		//组织
-		ctSaleExecVO.setPk_org_v(salesOrgVO.getPk_vid());
-		//日期
-		ctSaleExecVO.setVexecdate(new UFDate(json.getString("dbilldate")));
-		//执行过程
-		ctSaleExecVO.setVexecflow("取消生效");
-		//原因
-		ctSaleExecVO.setVexecreason(json.getString("vexecreason"));
-		//vo状态
-		ctSaleExecVO.setStatus(2);
-		//上层主键
-		ctSaleExecVO.setPk_ct_sale((String) aggCtSaleVO.getParent().getAttributeValue("pk_ct_sale"));
-		ctSaleExecArrVO[ctSaleExecArrVO.length-1] = ctSaleExecVO;
-		aggCtSaleVO.setChildren(CtSaleExecVO.class, ctSaleExecArrVO);
+		
+//		if(null==aggCtSaleVO.getChildren(CtSaleExecVO.class)){
+			CtSaleExecVO  ctSaleExecVO = new CtSaleExecVO();
+			//集团
+			ctSaleExecVO.setPk_group(aggCtSaleVO.getParentVO().getPk_group());
+			//原始组织
+			ctSaleExecVO.setPk_org(salesOrgVO.getPk_org());
+			//组织
+			ctSaleExecVO.setPk_org_v(salesOrgVO.getPk_vid());
+			//日期
+			ctSaleExecVO.setVexecdate(new UFDate(json.getString("dbilldate")));
+			//执行过程
+			ctSaleExecVO.setVexecflow("实际生效");
+			//原因
+			ctSaleExecVO.setVexecreason(json.getString("vexecreason"));
+			//vo状态
+			ctSaleExecVO.setStatus(2);
+			//上层主键
+			ctSaleExecVO.setPk_ct_sale((String) aggCtSaleVO.getParent().getAttributeValue("pk_ct_sale"));
+			CtSaleExecVO[] ctSaleExecArrVO = {ctSaleExecVO};
+			aggCtSaleVO.setChildren(CtSaleExecVO.class,ctSaleExecArrVO);
+			
+//		}else{
+//
+//			CtSaleExecVO[] ctSaleExecArrVO = new CtSaleExecVO[aggCtSaleVO.getChildren(CtSaleExecVO.class).length+1];
+//			for (int i = 0; i < aggCtSaleVO.getChildren(CtSaleExecVO.class).length; i++) {
+//				ctSaleExecArrVO[i] = (CtSaleExecVO) aggCtSaleVO.getChildren(CtSaleExecVO.class)[i];
+//			}
+//			CtSaleExecVO  ctSaleExecVO = new CtSaleExecVO();
+//			//集团
+//			ctSaleExecVO.setPk_group(aggCtSaleVO.getParentVO().getPk_group());
+//			//原始组织
+//			ctSaleExecVO.setPk_org(salesOrgVO.getPk_org());
+//			//组织
+//			ctSaleExecVO.setPk_org_v(salesOrgVO.getPk_vid());
+//			//日期
+//			ctSaleExecVO.setVexecdate(new UFDate(json.getString("dbilldate")));
+//			//执行过程
+//			ctSaleExecVO.setVexecflow("取消生效");
+//			//原因
+//			ctSaleExecVO.setVexecreason(json.getString("vexecreason"));
+//			//vo状态
+//			ctSaleExecVO.setStatus(2);
+//			//上层主键
+//			ctSaleExecVO.setPk_ct_sale((String) aggCtSaleVO.getParent().getAttributeValue("pk_ct_sale"));
+//			ctSaleExecArrVO[ctSaleExecArrVO.length-1] = ctSaleExecVO;
+//			aggCtSaleVO.setChildren(CtSaleExecVO.class, ctSaleExecArrVO);
+//		}
+		
 		//调用单据生效动作脚本
-		ipf.processAction("VALIDATE", "Z3", Workflownote, aggCtSaleVO, null, null);	
+		ipf.processAction("VALIDATE", "Z3", Workflownote, aggCtSaleVO, null, null);
+		
+		
 	}
 
 	public void processAction(JSONObject json) throws Exception {