zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangzhiguo:67778668f7a24d523f5b052f5355c44c2124205d
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
...
compare: zhangzhiguo:f14617a9942cb70edc4f089f063959167a983827
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

2 Commits
67778668f7 ... f14617a994

Author SHA1 Message Date
xuhaihui f14617a994 Merge remote-tracking branch 'origin/dev' into dev 2025-09-17 18:34:18 +08:00
xuhaihui bfdd5fd33d 出库单优化 2025-09-17 18:34:13 +08:00
1 changed files with 20 additions and 28 deletions
Show Stats Expand all files Collapse all files

48
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java
View File

@ -276,19 +276,16 @@ public class MaterialOutBillOpExt extends AbstractOperationServicePlugIn {
} }
} }
/* DynamicObjectCollection entryCol = obj.getDynamicObjectCollection("entryentity"); DynamicObjectCollection entryCol1 = obj.getDynamicObjectCollection("entryentity");
DynamicObject transType = obj.getDynamicObject("transtype"); DynamicObject transType1 = obj.getDynamicObject("transtype");
String type = transType.getString("type");*///注释掉系统标准代码 String type1 = transType1.getString("type");//注释掉系统标准代码
entryCol = obj.getDynamicObjectCollection("entryentity");//二开修改 if ("REDUCE".equals(type1)) {
transType = obj.getDynamicObject("transtype");//二开修改 String msg1 = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[])entryCol1.toArray(new DynamicObject[entryCol1.size()]));
type = transType.getString("type");//二开修改
if ("REDUCE".equals(type)) {
String msg1 = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[])entryCol.toArray(new DynamicObject[entryCol.size()]));
if (!"success".equals(msg1)) { if (!"success".equals(msg1)) {
throw new KDBizException(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)) { if (!"success".equals(msg2)) {
throw new KDBizException(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}); DynamicObject[] sporadicEntry = BusinessDataServiceHelper.load("ecco_sporadicmatcost", "id,billno,entryentity,entryentity.materialentryid", new QFilter[]{entryIdFilter});
if (sporadicEntry.length > 0) { 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")); 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(projectId); throw new KDBizException(errMsg);
} }
projectId = obj.getDynamicObject("org").getString("id"); orgId = obj.getDynamicObject("org").getString("id");
/* DynamicObject warehouse = obj.getDynamicObject("warehouse"); warehouse = obj.getDynamicObject("warehouse");
String warehouseId = warehouse.getString("id"); warehouseId = warehouse.getString("id");
DynamicObject projectobj = warehouse.getDynamicObject("project");*///注释掉系统标准代码 projectobj = warehouse.getDynamicObject("project");
warehouse = obj.getDynamicObject("warehouse");//二开修改
warehouseId = warehouse.getString("id");//二开修改
projectobj = warehouse.getDynamicObject("project");//二开修改
projectId = projectobj == null ? "0" : projectobj.getString("id"); projectId = projectobj == null ? "0" : projectobj.getString("id");
/* DynamicObjectCollection entryCol = obj.getDynamicObjectCollection("entryentity"); entryCol = obj.getDynamicObjectCollection("entryentity");
DynamicObject transType = obj.getDynamicObject("transtype"); transType = obj.getDynamicObject("transtype");
String type = transType.getString("type"); */ //注释掉系统标准代码 type = transType.getString("type");
entryCol = obj.getDynamicObjectCollection("entryentity");//二开修改
transType = obj.getDynamicObject("transtype");//二开修改
type = transType.getString("type");//二开修改
if ("INCREASE".equals(type)) { if ("INCREASE".equals(type)) {
requestPersonName = MaterialInventoryUtils.checkMatAsOut(projectId, projectId, warehouseId, (DynamicObject[])entryCol.toArray(new DynamicObject[entryCol.size()])); String checkResult = MaterialInventoryUtils.checkMatAsOut(orgId, projectId, warehouseId, (DynamicObject[]) entryCol.toArray(new DynamicObject[entryCol.size()]));
if (!"success".equals(requestPersonName)) { if (!"success".equals(checkResult)) {
team = String.format(ResManager.loadKDString("反审核失败，反审核后%s负库存！", "MaterialOutBillOp_6", "ec-ecma-opplugin", new Object[0]), requestPersonName.substring(0, requestPersonName.length() - 3)); String errMsg = String.format(ResManager.loadKDString("反审核失败，反审核后%s负库存！", "MaterialOutBillOp_6", "ec-ecma-opplugin", new Object[0]), checkResult.substring(0, checkResult.length() - 3));
throw new KDBizException(team); throw new KDBizException(errMsg);
} }
} }