diff --git a/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcess.java b/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcess.java index 195e151..e15c011 100644 --- a/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcess.java +++ b/ic/src/private/nc/bs/ic/m4d/sign/rule/PullProcess.java @@ -7,11 +7,16 @@ package nc.bs.ic.m4d.sign.rule; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import nc.bs.dao.BaseDAO; import nc.bs.logging.Logger; import nc.bs.trade.business.HYPubBO; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.impl.pubapp.pattern.rule.IRule; import nc.itf.arap.goldentax.SysParaInitQuery; +import nc.jdbc.framework.processor.ColumnListProcessor; +import nc.jdbc.framework.processor.ColumnProcessor; +import nc.jdbc.framework.processor.MapListProcessor; +import nc.jdbc.framework.processor.MapProcessor; import nc.uif.pub.exception.UifException; import nc.vo.bd.material.MaterialVO; import nc.vo.ic.m4d.entity.MaterialOutBodyVO; @@ -73,19 +78,28 @@ PullProcess implements IRule { obj.put("postingStatus", "Y"); obj.put("confirmationCode", "Y"); obj.put("changeFlag", null); - obj.put("companyCode", "DLDZ"); - obj.put("companyName", "泰开电力电子"); + + + BaseDAO dao = new BaseDAO(); + String orgsql = "select code,name from org_purchaseorg where pk_purchaseorg = '" + vo.getHead().getPk_org() + "' "; + Map tr = (Map) dao.executeQuery( orgsql, new MapProcessor()); + obj.put("companyCode", tr.get("code")); + obj.put("companyName", tr.get("name")); JSONArray jsonArray = new JSONArray(); for (MaterialOutBodyVO item: vo.getBodys()){ JSONObject detailItem = new JSONObject(); - detailItem.put("billCode", "DSF04-2507010196"); // 与主单据号一致 - detailItem.put("workOrderCode", "DSF01-2504030005"); + detailItem.put("billCode", vo.getHead().getVbillcode()); // 与主单据号一致 + detailItem.put("workOrderCode", null); detailItem.put("rowNum", 1); - detailItem.put("mrlCode", "506020103606"); - detailItem.put("mrlName", null); - detailItem.put("planInDate", null); - detailItem.put("planInQty", 49.236); - detailItem.put("unit", "M2"); + String mrlsql = "select code,name from bd_material_v where pk_source = '" + item.getCmaterialoid() + "' "; + Map mrl = (Map) dao.executeQuery( mrlsql, new MapProcessor()); + detailItem.put("mrlCode", mrl.get("code")); + detailItem.put("mrlName", mrl.get("name")); + detailItem.put("planInDate", item.getDbizdate()); + detailItem.put("planInQty", item.getNshouldassistnum().doubleValue()); + String unitsql = "select code from bd_measdoc where pk_measdoc = '" + item.getCastunitid() + "' "; + Map unit = (Map) dao.executeQuery( unitsql, new MapProcessor()); + detailItem.put("unit", unit.get("code")); detailItem.put("contractNo", null); detailItem.put("area", "S003"); detailItem.put("subArea", null);