From f1354e16970321389c6b1d9298c4db09621bf036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?= <125556714+Topfunplus@users.noreply.github.com> Date: Wed, 21 May 2025 20:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20MES=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了不必要的导入信息，简化了代码结构 - 在销售订单审批后同步规则中，添加了固定汇率字段 - 修改了采购合同签订后同步规则中的生成标志字段 - 移除了采购入库单签订后同步规则中未使用的字段 --- .../sign/rule/AfterSigningSynchronizeRuleMES.java | 14 -------------- .../sign/rule/AfterSigningSynchronizeRuleMES.java | 4 +++- .../approve/AfterApprovingSynchronizeRuleMES.java | 9 ++------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java b/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java index 89d669a..ded2051 100644 --- a/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java +++ b/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java @@ -91,24 +91,11 @@ public class AfterSigningSynchronizeRuleMES implements IRule { dataObj.put("creator", transferCodeByPk(PsndocVO.getDefaultTableName(), PsndocVO.NAME, PsndocVO.PK_PSNDOC, hvo.getCwhsmanagerid())); // Ա dataObj.put("remark", hvo.getVnote()); // ע - // ӲɹԱϢ - cbizidֶ -// String purchaser = transferCodeByPk(PsndocVO.getDefaultTableName(), -// PsndocVO.NAME, PsndocVO.PK_PSNDOC, hvo.getCbizid()); -// if (purchaser != null && !purchaser.isEmpty()) { -// dataObj.put("purchaser", purchaser); // ɹԱ -// } -// // ӹӦϢ - cvendoridֶ -// String supplier = transferCodeByPk(SupplierVO.getDefaultTableName(), -// SupplierVO.CODE, SupplierVO.PK_SUPPLIER, hvo.getCvendorid()); -// if (supplier != null && !supplier.isEmpty()) { -// dataObj.put("supplierId", supplier); // Ӧ̱ -// } // ϸ List detailsList = new ArrayList<>(); if (bvos != null) { for (PurchaseInBodyVO bvo : bvos) { JSONObject detailMap = new JSONObject(); - // TODO ûֶ detailMap.put("originalOrderNo", hvo.getVbillcode()); // ɹջ detailMap.put("sequenceNum", bvo.getCrowno()); // ɹջ // ϱ - @@ -118,7 +105,6 @@ public class AfterSigningSynchronizeRuleMES implements IRule { detailMap.put("storageId", transferCodeByPk(RackVO.getDefaultTableName(), RackVO.CODE, RackVO.PK_RACK, bvo.getClocationid())); // λ detailMap.put("batchNum", bvo.getVbatchcode()); // - // Ϣ - ֶα UFDouble assistNum = bvo.getNassistnum(); // ʵ detailMap.put("quantity", assistNum != null ? assistNum.doubleValue() : null); // diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java index 5b4c1b5..6689dc0 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java @@ -118,6 +118,8 @@ public class AfterSigningSynchronizeRuleMES implements IRule { dataObj.put("effDate", null); //۲ֿID dataObj.put("consignStoreId", null); + // ɷʽ + dataObj.put("genType", null); // dataObj.put("consignType", null); //˹ @@ -129,7 +131,7 @@ public class AfterSigningSynchronizeRuleMES implements IRule { //ͻID dataObj.put("customId", transferCodeByPk(CustomerVO.getDefaultTableName(), CustomerVO.CODE, CustomerVO.PK_CUSTOMER, hvo.getCcustomerid())); //ɱ־ - dataObj.put("mark", "W"); + dataObj.put("mark", "Y"); //ע dataObj.put("remark", hvo.getVnote()); // Detailsϸ diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java index 691f617..632c318 100644 --- a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java +++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java @@ -13,9 +13,6 @@ import nc.vo.bd.cust.CustomerVO; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.measdoc.MeasdocVO; import nc.vo.bd.psn.PsndocVO; -import nc.vo.cmp.util.StringUtils; -import nc.vo.ic.m4c.entity.SaleOutVO; -import nc.vo.org.DeptVO; import nc.vo.pub.BusinessException; import nc.vo.pub.billtype.BilltypeVO; import nc.vo.pub.lang.UFDate; @@ -31,7 +28,6 @@ import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -113,6 +109,8 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { // ң󳤶3 String currencyCode = transferCodeByPk(CurrtypeVO.getDefaultTableName(), CurrtypeVO.CODE, CurrtypeVO.PK_CURRTYPE, head.getCorigcurrencyid()); data.put("currency", currencyCode); + // nexchangerate + data.put("exchangeRate", 1); // DZֶһΪnull data.put("priceListId", null); data.put("invoicingUnit", transferCodeByPk(CustomerVO.getDefaultTableName(), CustomerVO.CODE, CustomerVO.PK_CUSTOMER, head.getCinvoicecustid())); @@ -141,7 +139,6 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { if (bodys != null) { for (SaleOrderBVO body : bodys) { JSONObject detailItem = new JSONObject(); - // ֶҪֶ // dreceivedate UFDate dreceivedate = body.getDreceivedate(); @@ -149,8 +146,6 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { // ƻ dsenddate UFDate dsenddate = body.getDsenddate(); data.put("deliveryDate", dsenddate != null ? dsenddate.toString().substring(0, 10) : null); - // nexchangerate - data.put("exchangeRate", body.getVchangerate() != null ? transferSpecialField(body.getVchangerate()) : null); // ±ֶ // detailItem.put("sequenceNum", body.getCrowno());