From 89602a24ac785c13caa277ca482ca9c06d73d8ab Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Wed, 24 Sep 2025 19:49:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A8=E8=89=BE=E6=99=AEMES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js
index 335529b9..09eb5e3d 100644
--- a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js
+++ b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js
@@ -673,14 +673,14 @@ export default function clickBtn(props, id, text, record, index) {
         case "tomes": {
             rowIds = [];
             let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value;
-            // 传递设计任务
+            // 生产订单手动推艾普MES
             rowIds[0] = billId;
             ajax({
                 url: '/nccloud/mmpac/pmo/PmoToMes.do',
                 data: {pks: rowIds},
                 success: (res) => {
                     if (res.success) {
-                        toast({content: "传递设计任务成功", color: 'success'});
+                        toast({content: "传递生产订单成功", color: 'success'});
                     }
                 }
             });

From fdaf26d720c100b9ea1b703af9981ac85f80c793 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Wed, 24 Sep 2025 20:27:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=9C=80=E5=A4=A7=E5=8C=96-zhangxin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mmpac/mmpac/pmo/pub/grand/index.js                        | 2 +-
 src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mmpac/mmpac/pmo/pub/grand/index.js b/src/mmpac/mmpac/pmo/pub/grand/index.js
index c93cfc24..6fcd109c 100644
--- a/src/mmpac/mmpac/pmo/pub/grand/index.js
+++ b/src/mmpac/mmpac/pmo/pub/grand/index.js
@@ -335,7 +335,7 @@ class GrandDialog extends Component {
 				}}
 				// onShow={this.initHead(this.props)}
 				ref={(NCModal) => (this.NCModal = NCModal)}
-				size="xlg"
+				size="max"
 			>
 				<NCHotKeys
 					keyMap={{
diff --git a/src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js b/src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js
index 7908d448..4ec440a3 100644
--- a/src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js
+++ b/src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js
@@ -99,7 +99,7 @@ export default function refAddLineComfirmBtnClick(array) {
 						npk_supplier = npk_supplier == null ? '' : npk_supplier;
 						npk_org = npk_org == null || npk_org == '' ? null : npk_org;
 						// 先判断表头的 业务交易类型、供应商、采购组织  三个是否一致 不一致不能追加
-						if (octrantypeid == nctrantypeid && opk_supplier == npk_supplier && opk_org == npk_org) {
+						if (octrantypeid == nctrantypeid && (opk_supplier == npk_supplier || npk_supplier =='') && opk_org == npk_org) {
 							cards[PAGECODE.cardbody].rows.map((o) => {
 								o.values.crowno = { display: null, value: null };
 								array.push({ index: rows++, data: o });