From 0f15d7eb2ac4c6b9ad68920aaf9adebfd59a24be Mon Sep 17 00:00:00 2001
From: houyi <1398559711@qq.com>
Date: Sat, 18 Oct 2025 11:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E9=87=8D?=
 =?UTF-8?q?=E7=AE=97=E5=92=8C=E9=A2=84=E7=95=99=E6=8E=A8=E9=80=81=E9=AB=98?=
 =?UTF-8?q?=E5=8E=8BMES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../billreserve/action/SaveAction.java        | 25 +++++++++++++++++--
 .../pickm/action/PickmSubItemAction.java      |  5 +++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/mmpac/src/client/nccloud/web/ic/reserve/billreserve/action/SaveAction.java b/mmpac/src/client/nccloud/web/ic/reserve/billreserve/action/SaveAction.java
index 11fb4b5c..e73c529c 100644
--- a/mmpac/src/client/nccloud/web/ic/reserve/billreserve/action/SaveAction.java
+++ b/mmpac/src/client/nccloud/web/ic/reserve/billreserve/action/SaveAction.java
@@ -6,7 +6,10 @@
 package nccloud.web.ic.reserve.billreserve.action;
 
 import nc.itf.ic.reserve.IReserveMaintenance;
+import nc.itf.mmpac.pickm.IPickmQueryService;
 import nc.vo.ic.reserve.entity.ReserveBillVO;
+import nc.vo.ic.reserve.entity.ReserveVO;
+import nc.vo.mmpac.pickm.entity.AggPickmVO;
 import nc.vo.pub.BusinessException;
 import nc.vo.scmpub.util.AppInfoContext;
 import nc.vo.scmpub.util.ArrayUtil;
@@ -20,6 +23,7 @@ import nccloud.framework.web.processor.template.ExtBillCardConvertProcessor;
 import nccloud.framework.web.ui.pattern.extbillcard.ExtBillCard;
 import nccloud.web.ic.reserve.entity.BillReserveSaveInfo;
 import nccloud.web.ic.reserve.precision.ReserveCardPrecisionHandler;
+import nccloud.web.mmpac.pickm.service.SyncGyMesPickmUtil;
 import nccloud.web.scmpub.pub.operator.SCMExtBillCardOperator;
 
 public class SaveAction implements ICommonAction {
@@ -63,12 +67,21 @@ public class SaveAction implements ICommonAction {
         if (null != retBillVOs && retBillVOs.length > 0) {
             SCMExtBillCardOperator operator = new SCMExtBillCardOperator("1001Z81000000000IE1V", "400802028_card");
             ExtBillCard[] retcards = new ExtBillCard[retBillVOs.length];
-
             for(int i = 0; i < retBillVOs.length; ++i) {
                 ExtBillCard resultCard = null;
                 if ("4B36".equals(saveInfo.getBillType())) {
                     resultCard = operator.toNoTransCard(retBillVOs[i]);
-                } else {
+                } else if("55A3".equals(saveInfo.getBillType())) {// 55A3：备料计划
+                    ReserveVO reserveVO = retBillVOs[i].getReserveVO();
+                    String[] pks = new String[]{reserveVO.getCreqbillid()};
+
+                    try {
+                        this.validate(pks);
+                    } catch (BusinessException e) {
+                        throw new RuntimeException(e);
+                    }
+
+                }else {
                     resultCard = operator.toCard(retBillVOs[i]);
                 }
 
@@ -81,4 +94,12 @@ public class SaveAction implements ICommonAction {
             return null;
         }
     }
+    // 获取备料计划数据
+    private void validate(String[] pks) throws BusinessException {
+        IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
+        AggPickmVO[] vos = service.queryBillsByPks(pks);
+
+        SyncGyMesPickmUtil pickmUtil = new SyncGyMesPickmUtil();
+        pickmUtil.process(vos);
+    }
 }
diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmSubItemAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmSubItemAction.java
index 1931de7b..41025e40 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmSubItemAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmSubItemAction.java
@@ -24,6 +24,7 @@ import nccloud.framework.web.action.itf.ICommonAction;
 import nccloud.framework.web.container.IRequest;
 import nccloud.framework.web.ui.pattern.billcard.BillCard;
 import nccloud.framework.web.ui.pattern.billcard.BillCardOperator;
+import nccloud.web.mmpac.pickm.service.SyncGyMesPickmUtil;
 import nccloud.web.mmpac.pickm.serviceproxy.PickmBusinessProxyNcc;
 import nccloud.web.mmpac.pickm.serviceproxy.PickmMaterialInfoProxyNcc;
 import nccloud.web.mmpac.pickm.serviceproxy.PickmQueryMOProxyNcc;
@@ -51,7 +52,9 @@ public class PickmSubItemAction implements ICommonAction {
             if (MMArrayUtil.isEmpty(pickmItemVOs)) {
                 ExceptionUtils.wrapBusinessException(PickmLangConsts.getHIT_NOITEMS());
             }
-
+            //备料计划点击备料重算后调高压MES修改
+            SyncGyMesPickmUtil pickmUtil = new SyncGyMesPickmUtil();
+            pickmUtil.process(new AggPickmVO[]{aggPickmVO});
             AggPickmVO newAggPickmVO = new AggPickmVO();
             newAggPickmVO.setChildren(PickmItemVO.class, pickmItemVOs);
             newAggPickmVO.setParentVO(aggPickmVO.getParentVO());