diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java index 094501a..ce789ea 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java @@ -26,6 +26,7 @@ import nc.vo.pubapp.pattern.pub.SqlBuilder; import nccloud.commons.lang.StringUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -322,11 +323,20 @@ public class SyncEpicMesUtil { JSONArray jsonArray = new JSONArray(); for (PMOItemVO item : vo.getChildrenVO()) { HYPubBO hybo = new HYPubBO(); - Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' "); - IBillcodeManage billcodeManage = NCLocator.getInstance().lookup(IBillcodeManage.class);; - String code = billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule", hvo.getPk_group(), hvo.getPk_org()); - String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code; - jsonArray.add(detailItem); +// List materialtype =(List) hybo.findColValue("mm_pmo_serialno", "vsncode", "cmoid = '" + item.getCmoid() + "' and dr = 0 "); +// IBillcodeManage billcodeManage = NCLocator.getInstance().lookup(IBillcodeManage.class);; +// 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 "; +// Map vsncodeList = (Map) dao.executeQuery(vsncode, new MapProcessor()); + ArrayList> vsncodeList = (ArrayList>)dao.executeQuery(vsncode, new MapListProcessor()); + if (vsncodeList.isEmpty()) { + continue; + } + for (Map v: vsncodeList) { + jsonArray.add(v.get("vsncode")); + } +// String detailItem = (null!=materialtype ?materialtype:"") + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code; +// jsonArray.add(detailItem); } obj.put("releaseNo", jsonArray);