diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureIms.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureIms.java index ba101a75..589e13b0 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureIms.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureIms.java @@ -8,6 +8,7 @@ import nc.bs.trade.business.HYPubBO; import nc.bs.uapbd.util.GyImsDbUtil; import nc.bs.uapbd.util.MyHelper; import nc.impl.pubapp.pattern.rule.IRule; +import nc.jdbc.framework.processor.ColumnProcessor; import nc.uif.pub.exception.UifException; import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; @@ -19,6 +20,7 @@ import nc.vo.pub.lang.UFDateTime; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.scmpub.util.ArrayUtil; +import java.math.BigDecimal; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.*; @@ -253,7 +255,7 @@ public class AfterApproveRuleHighpressureIms implements IRule { /** * 构建备料计划子表JSON */ - private JSONObject buildDetailJsonObject(PickmItemVO itemVO, String mainBillCode) throws UifException { + private JSONObject buildDetailJsonObject(PickmItemVO itemVO, String mainBillCode) throws UifException, DAOException { JSONObject detailJson = new JSONObject(); detailJson.put("cpickm_bid", itemVO.getCpickm_bid());// 备料计划明细 detailJson.put("cpickmid", itemVO.getCpickmid());// 备料计划单表头主键 @@ -274,7 +276,15 @@ public class AfterApproveRuleHighpressureIms implements IRule { detailJson.put("nplanoutastnum", itemVO.getNplanoutastnum() != null ? itemVO.getNplanoutastnum().doubleValue() : null); // 计划出库数量 detailJson.put("nplanoutnum", itemVO.getNplanoutnum() != null ? itemVO.getNplanoutnum().doubleValue() : null);// 计划出库主数量 detailJson.put("vbdef22", itemVO.getVbdef20()); // 是否备件 - detailJson.put("nunituseastnum", itemVO.getNunituseastnum() != null ? itemVO.getNunituseastnum().toString() : null); + // detailJson.put("nunituseastnum", itemVO.getNunituseastnum() != null ? itemVO.getNunituseastnum().toString() : null); + //备料计划的nunitastnum改成获取bom里的 nassitemnum + // Object nunitastnum = new HYPubBO().findColValue("bd_bom_b", "nassitemnum", "nvl(dr,0) = 0 and cbom_bid='" + itemVO.getCbombid() + "' "); + // detailJson.put("nquotastnum", nunitastnum);// 定额用量 + //备料计划的nunitastnum改成获取bom里的 nassitemnum + String sql = "select nassitemnum from bd_bom_b where nvl(dr,0) = 0 and cbom_bid='" + itemVO.getCbombid() + "' "; + BigDecimal nunitastnum = (BigDecimal) new BaseDAO().executeQuery(sql, new ColumnProcessor()); + // BigDecimal nunitastnum = (BigDecimal) new HYPubBO().findColValue("bd_bom_b", "nassitemnum", "nvl(dr,0) = 0 and cbom_bid='" + itemVO.getCbombid() + "' "); + detailJson.put("nunituseastnum",nunitastnum.doubleValue());// 定额用量 return detailJson; }