艾普MES-生产订单传出厂编号取值调整
This commit is contained in:
parent
b3db554a76
commit
170009f25e
|
@ -5,15 +5,11 @@ import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||||
import nc.bs.dao.BaseDAO;
|
import nc.bs.dao.BaseDAO;
|
||||||
import nc.bs.framework.common.NCLocator;
|
|
||||||
import nc.bs.logging.Log;
|
import nc.bs.logging.Log;
|
||||||
import nc.bs.trade.business.HYPubBO;
|
|
||||||
import nc.bs.uapbd.util.MyHelper;
|
import nc.bs.uapbd.util.MyHelper;
|
||||||
import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
|
import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
|
||||||
import nc.jdbc.framework.processor.MapListProcessor;
|
import nc.jdbc.framework.processor.MapListProcessor;
|
||||||
import nc.jdbc.framework.processor.MapProcessor;
|
import nc.jdbc.framework.processor.MapProcessor;
|
||||||
import nc.pub.billcode.itf.IBillcodeManage;
|
|
||||||
import nc.vo.bc.pmpub.project.ProjectHeadVO;
|
|
||||||
import nc.vo.bd.bom.bom0202.entity.BomVO;
|
import nc.vo.bd.bom.bom0202.entity.BomVO;
|
||||||
import nc.vo.bd.material.MaterialVO;
|
import nc.vo.bd.material.MaterialVO;
|
||||||
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
|
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
|
||||||
|
@ -26,7 +22,6 @@ import nc.vo.pubapp.pattern.pub.SqlBuilder;
|
||||||
import nccloud.commons.lang.StringUtils;
|
import nccloud.commons.lang.StringUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -188,7 +183,7 @@ public class SyncEpicMesUtil {
|
||||||
JSONObject orderParam = new JSONObject();
|
JSONObject orderParam = new JSONObject();
|
||||||
orderParam.put("id", null); // 唯一标识(主键)
|
orderParam.put("id", null); // 唯一标识(主键)
|
||||||
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
|
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
|
||||||
orderParam.put("contractNo", pmoItem.getVsalebillcode());// ºÏͬºÅ-È¡ERPµÄÏúÊÛ¶©µ¥ºÅ
|
orderParam.put("contractNo", pmoItem.getVfirstcode());// 合同号-取ERP的源头单据号-销售订单号
|
||||||
/*if (projectMap != null) {
|
/*if (projectMap != null) {
|
||||||
orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// 合同号
|
orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// 合同号
|
||||||
orderParam.put("contractName", projectMap.get(ProjectHeadVO.PROJECT_NAME)); // 合同名称
|
orderParam.put("contractName", projectMap.get(ProjectHeadVO.PROJECT_NAME)); // 合同名称
|
||||||
|
@ -322,11 +317,11 @@ public class SyncEpicMesUtil {
|
||||||
obj.put("companyName", tr.get("name"));
|
obj.put("companyName", tr.get("name"));
|
||||||
JSONArray jsonArray = new JSONArray();
|
JSONArray jsonArray = new JSONArray();
|
||||||
for (PMOItemVO item : vo.getChildrenVO()) {
|
for (PMOItemVO item : vo.getChildrenVO()) {
|
||||||
HYPubBO hybo = new HYPubBO();
|
// HYPubBO hybo = new HYPubBO();
|
||||||
// List<String> materialtype = (List<String>) hybo.findColValue("mm_pmo_serialno", "vsncode", "cmoid = '" + item.getCmoid() + "' and dr = 0 ");
|
// List<String> materialtype = (List<String>) hybo.findColValue("mm_pmo_serialno", "vsncode", "cmoid = '" + item.getCmoid() + "' and dr = 0 ");
|
||||||
// IBillcodeManage billcodeManage = NCLocator.getInstance().lookup(IBillcodeManage.class);;
|
// IBillcodeManage billcodeManage = NCLocator.getInstance().lookup(IBillcodeManage.class);
|
||||||
// String code = billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule", hvo.getPk_group(), hvo.getPk_org());
|
// String code = billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule", hvo.getPk_group(), hvo.getPk_org());
|
||||||
String vsncode = " select vsncode from mm_pmo_serialno where cmoid in ( '" + item.getCmoid() + "' ) and mm_pmo_serialno.dr = 0\t ";
|
String vsncode = " select vsncode from mm_pmo_serialno where cmoid in ( '" + item.getCmoid() + "' ) and mm_pmo_serialno.dr = 0 ";
|
||||||
// Map<String, Object> vsncodeList = (Map<String, Object>) dao.executeQuery(vsncode, new MapProcessor());
|
// Map<String, Object> vsncodeList = (Map<String, Object>) dao.executeQuery(vsncode, new MapProcessor());
|
||||||
ArrayList<Map<String, Object>> vsncodeList = (ArrayList<Map<String, Object>>) dao.executeQuery(vsncode, new MapListProcessor());
|
ArrayList<Map<String, Object>> vsncodeList = (ArrayList<Map<String, Object>>) dao.executeQuery(vsncode, new MapListProcessor());
|
||||||
if (vsncodeList.isEmpty()) {
|
if (vsncodeList.isEmpty()) {
|
||||||
|
|
Loading…
Reference in New Issue