Merge remote-tracking branch 'origin/main'

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'});
                     }
                 }
             });

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={{

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 });