From 68c3120b185c21164b3df5c1afb851475f9d0298 Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 5 Nov 2025 14:25:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(material):=20=E6=96=B0=E5=A2=9E=E5=BA=9F?= =?UTF-8?q?=E5=93=81=E7=8E=87=E5=AD=97=E6=AE=B5=E5=88=B0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=90=AF=E6=BA=90-=E7=B2=BE=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uapbd/material/action/MaterialJmPushToQyMesAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java index a7762efb..57b5eb36 100644 --- a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java +++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java @@ -22,6 +22,7 @@ import nc.vo.bd.material.stock.MaterialStockVO; import nc.vo.bd.stordoc.StordocVO; import nc.vo.org.OrgVO; import nc.vo.pub.BusinessException; +import nc.vo.pub.lang.UFDouble; import nccloud.api.rest.utils.ResultMessageUtil; import nccloud.framework.core.exception.ExceptionUtils; import nccloud.framework.core.json.IJson; @@ -96,11 +97,13 @@ public class MaterialJmPushToQyMesAction implements ICommonAction { // 计量单位 Map unitMap = getGoodsInfo(pkMaterial); Map planMap = queryMaterialPlanInfoByPks(new String[]{pkMaterial}, pkOrg1, - new String[]{MaterialPlanVO.DEF2}); + new String[]{MaterialPlanVO.DEF2, MaterialPlanVO.WASTERRATE}); String qyCode = ""; + UFDouble wasterrate = UFDouble.ZERO_DBL; if (MMValueCheck.isNotEmpty(planMap) && MMValueCheck.isNotEmpty(planMap.get(pkMaterial))) { qyCode = planMap.get(pkMaterial).getDef2(); + wasterrate = planMap.get(pkMaterial).getWasterrate(); } else { qyCode = vo.getCode(); } @@ -158,6 +161,7 @@ public class MaterialJmPushToQyMesAction implements ICommonAction { contentObj.put("zhxs", unitMap.getOrDefault("convertRate", "1.00")); // 转换系数 contentObj.put("flag_fq", statusCode); // 1/0 传递1代表物料废弃 contentObj.put("zcfck", warehouseCode); // 主存放仓库 + contentObj.put("fpl", wasterrate.toString()); // 废品率 contentObj.put("bz", vo.getMemo()); // 备注信息 setDefVal(vo, contentObj); JSONArray contentArr = new JSONArray();