From bfdd5fd33daac94fd93ac3be842bdfd85e7bdb73 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 17 Sep 2025 18:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/operate/MaterialOutBillOpExt.java | 48 ++++++++----------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java index b46ce59..c706879 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java @@ -276,19 +276,16 @@ public class MaterialOutBillOpExt extends AbstractOperationServicePlugIn { } } -/* DynamicObjectCollection entryCol = obj.getDynamicObjectCollection("entryentity"); - DynamicObject transType = obj.getDynamicObject("transtype"); - String type = transType.getString("type");*///注释掉系统标准代码 - entryCol = obj.getDynamicObjectCollection("entryentity");//二开修改 - transType = obj.getDynamicObject("transtype");//二开修改 - type = transType.getString("type");//二开修改 - if ("REDUCE".equals(type)) { - String msg1 = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[])entryCol.toArray(new DynamicObject[entryCol.size()])); + DynamicObjectCollection entryCol1 = obj.getDynamicObjectCollection("entryentity"); + DynamicObject transType1 = obj.getDynamicObject("transtype"); + String type1 = transType1.getString("type");//注释掉系统标准代码 + if ("REDUCE".equals(type1)) { + String msg1 = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[])entryCol1.toArray(new DynamicObject[entryCol1.size()])); if (!"success".equals(msg1)) { throw new KDBizException(msg1); } - String msg2 = MaterialInventoryUtils.matBalanceLocked(orgId, projectId, warehouseId, (DynamicObject[])entryCol.toArray(new DynamicObject[entryCol.size()]), true); + String msg2 = MaterialInventoryUtils.matBalanceLocked(orgId, projectId, warehouseId, (DynamicObject[])entryCol1.toArray(new DynamicObject[entryCol1.size()]), true); if (!"success".equals(msg2)) { throw new KDBizException(msg2); } @@ -369,29 +366,24 @@ public class MaterialOutBillOpExt extends AbstractOperationServicePlugIn { DynamicObject[] sporadicEntry = BusinessDataServiceHelper.load("ecco_sporadicmatcost", "id,billno,entryentity,entryentity.materialentryid", new QFilter[]{entryIdFilter}); if (sporadicEntry.length > 0) { - projectId = String.format(ResManager.loadKDString("单据名称：%1$s，单据编号：%2$s的分录已被零星材料分摊单分录引用，无法反审核！", "MaterialOutBillOp_5", "ec-ecma-opplugin", new Object[0]), obj.getString("billname"), obj.getString("billno")); - throw new KDBizException(projectId); + String errMsg = String.format(ResManager.loadKDString("单据名称：%1$s，单据编号：%2$s的分录已被零星材料分摊单分录引用，无法反审核！", "MaterialOutBillOp_5", "ec-ecma-opplugin", new Object[0]), obj.getString("billname"), obj.getString("billno")); + throw new KDBizException(errMsg); } - projectId = obj.getDynamicObject("org").getString("id"); -/* DynamicObject warehouse = obj.getDynamicObject("warehouse"); - String warehouseId = warehouse.getString("id"); - DynamicObject projectobj = warehouse.getDynamicObject("project");*///注释掉系统标准代码 - warehouse = obj.getDynamicObject("warehouse");//二开修改 - warehouseId = warehouse.getString("id");//二开修改 - projectobj = warehouse.getDynamicObject("project");//二开修改 + orgId = obj.getDynamicObject("org").getString("id"); + warehouse = obj.getDynamicObject("warehouse"); + warehouseId = warehouse.getString("id"); + projectobj = warehouse.getDynamicObject("project"); projectId = projectobj == null ? "0" : projectobj.getString("id"); -/* DynamicObjectCollection entryCol = obj.getDynamicObjectCollection("entryentity"); - DynamicObject transType = obj.getDynamicObject("transtype"); - String type = transType.getString("type"); */ //注释掉系统标准代码 - entryCol = obj.getDynamicObjectCollection("entryentity");//二开修改 - transType = obj.getDynamicObject("transtype");//二开修改 - type = transType.getString("type");//二开修改 + entryCol = obj.getDynamicObjectCollection("entryentity"); + transType = obj.getDynamicObject("transtype"); + type = transType.getString("type"); + if ("INCREASE".equals(type)) { - requestPersonName = MaterialInventoryUtils.checkMatAsOut(projectId, projectId, warehouseId, (DynamicObject[])entryCol.toArray(new DynamicObject[entryCol.size()])); - if (!"success".equals(requestPersonName)) { - team = String.format(ResManager.loadKDString("反审核失败，反审核后%s负库存！", "MaterialOutBillOp_6", "ec-ecma-opplugin", new Object[0]), requestPersonName.substring(0, requestPersonName.length() - 3)); - throw new KDBizException(team); + String checkResult = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[]) entryCol.toArray(new DynamicObject[entryCol.size()])); + if (!"success".equals(checkResult)) { + String errMsg = String.format(ResManager.loadKDString("反审核失败，反审核后%s负库存！", "MaterialOutBillOp_6", "ec-ecma-opplugin", new Object[0]), checkResult.substring(0, checkResult.length() - 3)); + throw new KDBizException(errMsg); } }