From 76b0efcc3f0215d1dc7cd3818d563da5c9bb69a5 Mon Sep 17 00:00:00 2001 From: lihao Date: Sat, 11 Oct 2025 13:37:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8E=8Bmes=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterApproveSyncHighpressureMesRule.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java index 2677e1ca..d469bc89 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java @@ -111,9 +111,9 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { String sql = " select pk_defdoclist from bd_defdoclist where code='zdy-001' and dr=0 "; String o = (String) baseDAO.executeQuery(sql, new ColumnProcessor()); - Object contractNum = hybo.findColValue("bd_defdoc", "code", " (pk_defdoclist = '" + o + "' and pk_defdoc='" + item.getVdef1() + "') "); +// Object contractNum = hybo.findColValue("bd_defdoc", "code", " (pk_defdoclist = '" + o + "' and pk_defdoc='" + item.getVdef1() + "') "); - itemObj.put("contractNum", contractNum); // 合同编号 + itemObj.put("contractNum", item.getVdef2()); // 销售订单号 Object cwarehouseid = hybo.findColValue("bd_stordoc", "code", " (pk_stordoc = '" + item.getAttributeValue("vbdef35") + "') "); @@ -162,7 +162,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { itemObj.put("customerMaterialCode", item.getCcustmaterialid()); // 客户物料编码 itemObj.put("productionBatch", item.getCbatchid()); // 生产批次(按BIP格式) itemObj.put("productionBatchNumber", item.getVbatchcode()); // 生产批次号(按BIP格式) - + itemObj.put("orderQuantity", item.getNastnum().doubleValue()); contentArray.add(itemObj); // 将子项添加到数组 flags = "addOrder"; @@ -191,11 +191,15 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { // 日期信息 itemObj.put("requiredDate", item.getTrequiredate().toString()); // 需用日期 + if("55A2".equals(item.getVsrctype())){ + itemObj.put("bipParentProcessProductionOrderId", item.getVparentbillcode()); + itemObj.put("bipParentProcessProductionOrderRowNum", item.getVparentmorowno()); + } + if("55A2".equals(item.getVfirsttype())){ + itemObj.put("bipOriginProcessProductionOrderId", item.getVfirstcode()); + itemObj.put("bipOriginProcessProductionOrderRowNum", item.getVfirstrowno()); + } - itemObj.put("bipParentProcessProductionOrderId", item.getVparentbillcode()); - itemObj.put("bipParentProcessProductionOrderRowNum", item.getVparentmorowno()); - itemObj.put("bipOriginProcessProductionOrderId", item.getVsalebillcode()); - itemObj.put("bipOriginProcessProductionOrderRowNum", ""); // 物料信息 String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + cmaterialvid + "' ";