feat(material): 新增废品率字段到物料推送启源-精密

This commit is contained in:
mzr 2025-11-05 14:25:45 +08:00
parent 2afff0cd1f
commit 68c3120b18
1 changed files with 5 additions and 1 deletions

View File

@ -22,6 +22,7 @@ import nc.vo.bd.material.stock.MaterialStockVO;
import nc.vo.bd.stordoc.StordocVO; import nc.vo.bd.stordoc.StordocVO;
import nc.vo.org.OrgVO; import nc.vo.org.OrgVO;
import nc.vo.pub.BusinessException; import nc.vo.pub.BusinessException;
import nc.vo.pub.lang.UFDouble;
import nccloud.api.rest.utils.ResultMessageUtil; import nccloud.api.rest.utils.ResultMessageUtil;
import nccloud.framework.core.exception.ExceptionUtils; import nccloud.framework.core.exception.ExceptionUtils;
import nccloud.framework.core.json.IJson; import nccloud.framework.core.json.IJson;
@ -96,11 +97,13 @@ public class MaterialJmPushToQyMesAction implements ICommonAction {
// 计量单位 // 计量单位
Map unitMap = getGoodsInfo(pkMaterial); Map unitMap = getGoodsInfo(pkMaterial);
Map<String, MaterialPlanVO> planMap = queryMaterialPlanInfoByPks(new String[]{pkMaterial}, pkOrg1, Map<String, MaterialPlanVO> planMap = queryMaterialPlanInfoByPks(new String[]{pkMaterial}, pkOrg1,
new String[]{MaterialPlanVO.DEF2}); new String[]{MaterialPlanVO.DEF2, MaterialPlanVO.WASTERRATE});
String qyCode = ""; String qyCode = "";
UFDouble wasterrate = UFDouble.ZERO_DBL;
if (MMValueCheck.isNotEmpty(planMap) && if (MMValueCheck.isNotEmpty(planMap) &&
MMValueCheck.isNotEmpty(planMap.get(pkMaterial))) { MMValueCheck.isNotEmpty(planMap.get(pkMaterial))) {
qyCode = planMap.get(pkMaterial).getDef2(); qyCode = planMap.get(pkMaterial).getDef2();
wasterrate = planMap.get(pkMaterial).getWasterrate();
} else { } else {
qyCode = vo.getCode(); qyCode = vo.getCode();
} }
@ -158,6 +161,7 @@ public class MaterialJmPushToQyMesAction implements ICommonAction {
contentObj.put("zhxs", unitMap.getOrDefault("convertRate", "1.00")); // 转换系数 contentObj.put("zhxs", unitMap.getOrDefault("convertRate", "1.00")); // 转换系数
contentObj.put("flag_fq", statusCode); // 1/0 传递1代表物料废弃 contentObj.put("flag_fq", statusCode); // 1/0 传递1代表物料废弃
contentObj.put("zcfck", warehouseCode); // 主存放仓库 contentObj.put("zcfck", warehouseCode); // 主存放仓库
contentObj.put("fpl", wasterrate.toString()); // ·ÏÆ·ÂÊ
contentObj.put("bz", vo.getMemo()); // 备注信息 contentObj.put("bz", vo.getMemo()); // 备注信息
setDefVal(vo, contentObj); setDefVal(vo, contentObj);
JSONArray contentArr = new JSONArray(); JSONArray contentArr = new JSONArray();