From 4612e2f19b6a618ee965a9777333a5def8218e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?=
 <sdlizheng@yonyou.com>
Date: Sun, 18 May 2025 15:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A2=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=90=8C=E6=AD=A5=E9=94=90=E5=88=B6=E4=BB=A3=E7=A0=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

---
 .../AfterApproceRuleSyncRZWMSProcess.java     | 22 ++++++++++++++-----
 .../src/client}/SCOrderApproveAction.java     |  2 ++
 2 files changed, 18 insertions(+), 6 deletions(-)
 rename {sc/src/private/nc/bs/sc/m61/referred/rule/pm => arap/src/client}/AfterApproceRuleSyncRZWMSProcess.java (86%)
 rename {sc/src/private/nc/impl/sc/m61/action/approve => arap/src/client}/SCOrderApproveAction.java (98%)

diff --git a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java b/arap/src/client/AfterApproceRuleSyncRZWMSProcess.java
similarity index 86%
rename from sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java
rename to arap/src/client/AfterApproceRuleSyncRZWMSProcess.java
index c78dcd2..64ac1fc 100644
--- a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java
+++ b/arap/src/client/AfterApproceRuleSyncRZWMSProcess.java
@@ -16,6 +16,7 @@ import nc.vo.bd.supplier.SupplierVO;
 import nc.vo.cmp.util.StringUtils;
 import nc.vo.org.OrgVO;
 import nc.vo.pub.BusinessException;
+import nc.vo.pub.lang.UFDouble;
 import nc.vo.pubapp.pattern.exception.ExceptionUtils;
 import nc.vo.pubapp.pattern.pub.SqlBuilder;
 import nc.vo.sc.m61.entity.SCOrderHeaderVO;
@@ -53,7 +54,8 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule<SCOrderVO> {
 
         for (SCOrderItemVO body : bodys) {
             JSONObject singleObj = new JSONObject();
-
+            //操作状态 1新增/修改、2删除（删除时只需上传wbid）
+            singleObj.put("operate", 1);
             // 单据类型
             singleObj.put("cgjh_wbid", body.getVsrctrantype()); // 第三方系统采购计划id
             singleObj.put("cgxh", body.getVsrcrowno());           // 采购计划序号
@@ -68,10 +70,17 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule<SCOrderVO> {
             // 物料
             singleObj.put("wlbm_wbid", transferCodeByPk(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL, body.getPk_material())); // 第三方系统材料id
 
-            singleObj.put("cgsl", body.getNqtunitnum());          // 采购数量
-            singleObj.put("jhrq", body.getDplanarrvdate());       // 交货日期
-            singleObj.put("zbxx_cgrq", head.getDbilldate().toString()); // 采购日期
-            singleObj.put("cgrq", head.getDbilldate()).toString();  // 采购日期
+            UFDouble nqtunitnum = body.getNqtunitnum() == null ? UFDouble.ZERO_DBL : body.getNqtunitnum();
+            singleObj.put("cgsl", nqtunitnum.getDouble());          // 采购数量
+            if (body.getDplanarrvdate() != null) {
+                singleObj.put("jhrq", body.getDplanarrvdate().toString());       // 交货日期
+            }
+            if (head.getDbilldate() != null) {
+                singleObj.put("zbxx_cgrq", head.getDbilldate().toString()); // 采购日期
+            }
+            if (head.getDbilldate() != null) {
+                singleObj.put("cgrq", head.getDbilldate().toString());  // 采购日期
+            }
 
             singleObj.put("htxh", body.getCrowno());              // 合同序号
             singleObj.put("zbxx_cgy_wbid", transferCodeByPk(PsndocVO.getDefaultTableName(), PsndocVO.CODE, PsndocVO.PK_PSNDOC, head.getCemployeeid())); // 第三方系统采购员id
@@ -85,8 +94,9 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule<SCOrderVO> {
         List<SCOrderVO> aggvoList = new ArrayList<>();
         for (SCOrderVO aggvo : SCOrderVOS) {
             String pkOrg = aggvo.getParentVO().getPk_org();
+            Integer fstatusflag = aggvo.getParentVO().getFstatusflag();
             String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
-            if ("30401".equals(orgCode)) {
+            if ("30401".equals(orgCode) && 3 == fstatusflag) {
                 aggvoList.add(aggvo);
             }
         }
diff --git a/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java b/arap/src/client/SCOrderApproveAction.java
similarity index 98%
rename from sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java
rename to arap/src/client/SCOrderApproveAction.java
index 6205993..4664bed 100644
--- a/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java
+++ b/arap/src/client/SCOrderApproveAction.java
@@ -45,6 +45,8 @@ public class SCOrderApproveAction {
         prcr.addAfterRule(new SCOrderRewritePMStartDateRule(true));
         prcr.addAfterRule(new ApproveSupplyRule());
         prcr.addAfterRule(new SCOrderApprovePMSupplyRule());
+
+        //2025年5月18日15点12分--互感器委外订单审批推送RZ系统
         prcr.addAfterRule(new AfterApproceRuleSyncRZWMSProcess());
     }