From 6c7652d70c2e62b7958d4d5b5a97c6cf3d8efbd1 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Fri, 5 Sep 2025 18:24:14 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93-?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97=E5=AD=97=E6=AE=B5=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickm/card/btnClicks/borrowBtnClick.js | 100 ++++++++++++++++++ src/mmpac/mmpac/pickm/card/index.js | 5 +- .../card/viewController/btnClickControllor.js | 27 +---- src/mmpac/mmpac/pickm/constance/index.js | 6 +- .../pickmborrow/list/events/headAfterEvent.js | 4 + .../list/events/headBeforeEvent.js | 15 +++ .../pickm/pickmborrow/list/events/index.js | 3 + .../mmpac/pickm/pickmborrow/list/index.js | 60 +++++++++++ .../pickm/pickmborrow/list/init/index.js | 2 + .../pickmborrow/list/init/initTemplate.js | 43 ++++++++ 10 files changed, 237 insertions(+), 28 deletions(-) create mode 100644 src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/events/index.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/index.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/init/index.js create mode 100644 src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js new file mode 100644 index 00000000..d35861df --- /dev/null +++ b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js @@ -0,0 +1,100 @@ +import {ajax, base, toast} from 'nc-lightapp-front'; +import {AREA, DIALOGCODE, FIELD, URL} from '../../constance'; +import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; +import PickmBorrowDlg from "../../pickmborrow/list"; + +let {NCModal, NCButton, NCTooltip, NCHotKeys} = base; + +const TABLE_HEAD = 'borrow_list'; +export default function borrowBtnClick(props, record) { + let _this = this; + this.props = {}; + let setProps = (val) => { + this.props = val; + } + let bids = []; + let hid; + let rows = props.cardTable.getCheckedRows(AREA.bodyTable); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows) { + return; + } + if (rows.length <= 0) { + hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + } else { + rows.map((item) => { + let cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; + bids.push(cpickm_bid); + }); + } + let appcode = props.getAppCode(); + let param = { + cpickmid: hid, + cpickmbids: bids, + pageid: DIALOGCODE.BORROWDLG, + appcode: appcode + } + ajax({ + url: URL.pickmItemsQuery, + data: param, + success: res => { + if (res.success && res.data) { + let showData = res.data.data; + props.modal.show('BorrowDlg', { + size: 'max', + title: '借料入库明细', + content: , + userControl: true, + // leftBtnName: '', + // rightBtnName: getLangByResId(this, '5008Pickm-000013'),/* 国际化处理： 取消*/ + beSureBtnClick: oKBtnClicks.bind(this, props, true), + cancelBtnClick: () => { + props.modal.close('BorrowDlg'); + } + }); + } + } + }); +} + +function oKBtnClicks(props) { + let rowids = []; + let hids = []; + let hid; + let rows = props.table.getCheckedRows(AREA.borrowMaterialDialog); + hid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + hids.push(hid); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows || rows.length <= 0) { + showWarningInfo('请选择行'); + return; + } + for (let i = 0; i < rows.length; i++) { + rowids.push(rows[i].data.values.cpickm_bid.value); + } + let data = { + cpickmids: hids, + cpickmbids: rowids + } + console.log('data = ', data); + ajax({ + url: URL.pickmItemsQuery, + data: data, + success: res => { + if (res.success && res.data) { + if (res.success) { + toast({color: 'success', title: "推送成功"}); + this.props.modal.close(AREA.borrowMaterialDialog); + } + } + }, + error: (error) => { + toast({ + color: 'warning', + content: error.message + }); + } + }); +} diff --git a/src/mmpac/mmpac/pickm/card/index.js b/src/mmpac/mmpac/pickm/card/index.js index b544cc15..4bf1b47b 100644 --- a/src/mmpac/mmpac/pickm/card/index.js +++ b/src/mmpac/mmpac/pickm/card/index.js @@ -272,6 +272,7 @@ class PickmCard extends Component { {createModal('TakeOverDlg', {zIndex: "300"})} {createModal('SetBackDeliverDlg', {zIndex: "280"})} {createModal('ReplaceDlg', {zIndex: "300"})} + {createModal('BorrowDlg', {zIndex: "300"})} {createModal(AREA.borrowMaterialDialog, { title: '借料入库明细', @@ -284,7 +285,7 @@ class PickmCard extends Component { let rowids = []; let hids = []; let hid; - let rows = this.props.table.getCheckedRows(AREA.borrowMaterialDialog); + let rows = this.props.table.getCheckedRows(AREA.borrowMaterialDialog); hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; hids.push(hid); // 如果没有选中行，则提示并返回，不进行任何操作 @@ -292,7 +293,7 @@ class PickmCard extends Component { showWarningInfo('请选择行'); return; } - for (let i = 0; i < rows.length; i++){ + for (let i = 0; i < rows.length; i++) { rowids.push(rows[i].data.values.cpickm_bid.value); } let data = { diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index 38e83b46..caaa88c3 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -42,6 +42,7 @@ import {pickmTakeOver} from '../../../pub/pickmtakeover'; import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; import {pickmBackDeliverWithSet} from '../../../pub/pickmbackdeliverwithset'; import {toast} from "../../../../../gl/public/components/utils"; +import borrowBtnClick from "../btnClicks/borrowBtnClick"; export default async function clickBtn(props, id, text, record, index) { let _this = this; @@ -818,33 +819,11 @@ export default async function clickBtn(props, id, text, record, index) { showWarningInfo(getLangByResId(this, '5008Pickm-000061')); return; } - - // console.log('selectRows = ', selectRows); - // 判断选中行的借料数量是否>0,如果存在<=0的行，则提示并返回 - let hasInvalidRow = false; - let warningMessage = getLangByResId(this, '5008Pickm-000106'); /* 国际化处理： 借料数量必须大于0！*/ - // for (const item of selectRows) { - // let values = item.data.values; - // // 借料数量 = 计划出库数量-累计出库数量-累计发货数量-累计委外数量 - // let borrowedQty = getNumber(values.nplanoutastnum) - getNumber(values.naccoutastnum) - - // getNumber(values.nshouldastnum) - getNumber(values.npscastnum); - // if (borrowedQty <= 0) { - // hasInvalidRow = true; - // // 获取行号用于提示信息 - // let vrowno = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'vrowno'); - // warningMessage = warningMessage + ' 行号:' + `[${vrowno.value}]`; - // break; - // } - // } - // if (hasInvalidRow) { - // showErrorInfo('错误', warningMessage); - // return; - // } - billstatus = props.form.getFormItemsValue(AREA.formArea, 'fbillstatus'); //审批态 if (billstatus && billstatus.value && billstatus.value == 1) { - detailqueryBtnClick.call(this, this.props, record); + // detailqueryBtnClick.call(this, this.props, record); + borrowBtnClick.call(this, this.props, record); } else { toast({color: 'warning', title: "只有审批后单据才能生产其他入库单"}); } diff --git a/src/mmpac/mmpac/pickm/constance/index.js b/src/mmpac/mmpac/pickm/constance/index.js index 26ebc5c8..f6e66e66 100644 --- a/src/mmpac/mmpac/pickm/constance/index.js +++ b/src/mmpac/mmpac/pickm/constance/index.js @@ -10,7 +10,8 @@ const AREA = { cardHeadBtnArea: 'card_head', //卡片表头按钮区域 cardBodyBtnArea: 'card_body', //卡片表体按钮区域 cardBodyInnerBtnArea: 'card_body_inner', //卡片表体操作按钮区域 - borrowMaterialDialog: 'NCTable_83c3abf9' //借料弹窗 + borrowMaterialDialog: 'NCTable_83c3abf9', //借料弹窗 + borrowList: 'borrow_list' //借料弹窗 }; const MANUFACTURE = 'fa';//製造場景 @@ -23,7 +24,8 @@ const DIALOGCODE = { BACKDELIVERDLG: '50080102_backdeliver', SETBACKDELIVERDLG: '50080102_backdeliverwithset', TAKEOVERDLG: '50080102_takeover', - REPLACEDLG: '50080102_replace' + REPLACEDLG: '50080102_replace', + BORROWDLG: '50080102_borrow' } const LIST_BTN = { diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js new file mode 100644 index 00000000..7e1ea810 --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js @@ -0,0 +1,4 @@ +export default async function headAfterEvent(props, moduleId, key, value, changedrows, i) { + let headData = props.editTable.getAllData('replace_head', true); + this.props.setHeadDatas(headData); +} diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js new file mode 100644 index 00000000..6784f955 --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js @@ -0,0 +1,15 @@ + +export default function headBeforeEvent(props, moduleId, item, index, value, record) { + let key = item.attrcode; + let editFields = ['freplacetype']; + if (!editFields.includes(key)) { + return false; + } + else if (key == 'freplacetype') { + //以替代的备料计划表体不能修改替代类型 + let replaceInfo = props.editTable.getValByKeyAndIndex(moduleId, index, 'freplaceinfo').value; + if (replaceInfo == 2) { + return false; + } + } return true; +} diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/index.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/index.js new file mode 100644 index 00000000..1b944cb5 --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/index.js @@ -0,0 +1,3 @@ +import headBeforeEvent from './headBeforeEvent'; +import headAfterEvent from './headAfterEvent'; +export { headBeforeEvent,headAfterEvent }; diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/index.js b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js new file mode 100644 index 00000000..63239f01 --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js @@ -0,0 +1,60 @@ +import React, {Component} from 'react'; +import {base, createPage, high} from 'nc-lightapp-front'; +import {initTemplate} from './init'; +import {initLang} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import {headAfterEvent} from './events'; +import {DIALOGCODE} from "../../constance"; + +const {Refer} = high; +const {NCModal} = base; +const TABLE_HEAD = 'borrow_list'; + +class PickmBorrowDlg extends Component { + constructor(props) { + super(props); + props.use.editTable(TABLE_HEAD); + this.state = { + totalRepNum: {} + }; + initLang(this, ['5008Pickm'], 'mmpac', initTemplate.bind(this, this.props)); + } + + componentDidMount() { + this.initData(); + } + + //请求列表数据 + initData = () => { + let showdata = this.props.showdata; + this.props.editTable.setTableData(TABLE_HEAD, showdata.borrow_list); + this.props.setProps(this.props); + }; + + render() { + let {editTable} = this.props; + let {createEditTable} = editTable; + return
+
+ {createEditTable(TABLE_HEAD, { + showIndex: true, + // height: 100, + // onRowClick: this.onRowClick.bind(this), + // onRowDoubleClick: this.onRowDoubleClick.bind(this), + // onBeforeEvent: headBeforeEvent.bind(this), + onAfterEvent: headAfterEvent.bind(this), + isAddRow: false, + showCheck: false + })} +
+
; + } +} + +PickmBorrowDlg = createPage({ + billinfo: { + billtype: 'grid', + pagecode: DIALOGCODE.BORROWDLG + }//, +})(PickmBorrowDlg); + +export default PickmBorrowDlg; diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/init/index.js b/src/mmpac/mmpac/pickm/pickmborrow/list/init/index.js new file mode 100644 index 00000000..54195f48 --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/init/index.js @@ -0,0 +1,2 @@ +import initTemplate from './initTemplate'; +export { initTemplate }; diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js b/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js new file mode 100644 index 00000000..92841d5a --- /dev/null +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js @@ -0,0 +1,43 @@ +import { DIALOGCODE } from '../../../constance'; +import { getLangByResId } from '../../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +const TABLE_HEAD = 'borrow_list'; + +export default function (props) { + let appcode = props.getAppCode(); + if (props.getAppCode().startsWith('5009')) { + appcode = '50090102'; + } + else if (props.getAppCode().startsWith('5008')) { + appcode = '50080102'; + } + //请求模板数据 + props.createUIDom( + { + appcode: appcode, + pagecode: DIALOGCODE.BORROWDLG + }, + (templedata) => { + if (templedata.template) { + let meta = templedata.template; + // modifierMeta.call(this, this.props, meta); + props.meta.setMeta(meta); + props.editTable.setStatus(TABLE_HEAD, 'edit'); + // props.editTable.setStatus(TABLE_BODY, 'edit'); + } + }); +} +function modifierMeta(props, meta) { + meta[TABLE_HEAD].items.map((item) => { + if (item.attrcode == 'freplacetype') { + item.options = [{ + display: getLangByResId(this, '5008Pickm-000096')/* 国际化处理： "全部替代"*/, + value: "1" + }, { + display: getLangByResId(this, '5008Pickm-000097')/* 国际化处理： ""部分替代"*/, + value: "2" + } + ]; + } + }); + return meta; +} From 687aa7765c7e912e521e1de371e0cde002b40a84 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Sun, 7 Sep 2025 11:05:41 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/card/btnClicks/borrowBtnClick.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js index d35861df..c1cae895 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js @@ -1,6 +1,5 @@ import {ajax, base, toast} from 'nc-lightapp-front'; import {AREA, DIALOGCODE, FIELD, URL} from '../../constance'; -import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; import PickmBorrowDlg from "../../pickmborrow/list"; @@ -63,7 +62,7 @@ function oKBtnClicks(props) { let rowids = []; let hids = []; let hid; - let rows = props.table.getCheckedRows(AREA.borrowMaterialDialog); + let rows = props.table.getCheckedRows(TABLE_HEAD); hid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; hids.push(hid); // 如果没有选中行，则提示并返回，不进行任何操作 @@ -76,17 +75,18 @@ function oKBtnClicks(props) { } let data = { cpickmids: hids, - cpickmbids: rowids + cpickmbids: rowids, + rows: rows } console.log('data = ', data); ajax({ - url: URL.pickmItemsQuery, + url: URL.convertOtherIn, data: data, success: res => { if (res.success && res.data) { if (res.success) { - toast({color: 'success', title: "推送成功"}); - this.props.modal.close(AREA.borrowMaterialDialog); + toast({color: 'success', title: "操作成功"}); + this.props.modal.close(TABLE_HEAD); } } }, From 8139749fe1758d1f45091e4d6752b6d238e51485 Mon Sep 17 00:00:00 2001 From: mzr Date: Sun, 7 Sep 2025 18:01:07 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=A4=A7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickm/card/btnClicks/borrowBtnClick.js | 49 +-------- .../pickm/card/btnClicks/borrowOkBtnClick.js | 62 +++++++++++ src/mmpac/mmpac/pickm/card/btnClicks/index.js | 4 +- src/mmpac/mmpac/pickm/card/index.js | 4 +- src/mmpac/mmpac/pickm/constance/index.js | 4 +- src/mmpac/mmpac/pickm/list/index.js | 5 +- .../viewController/buttonClickController.js | 101 ++++++++++++------ .../pickmborrow/list/events/headAfterEvent.js | 6 +- .../list/events/headBeforeEvent.js | 7 +- .../mmpac/pickm/pickmborrow/list/index.js | 13 ++- .../pickmborrow/list/init/initTemplate.js | 62 ++++------- 11 files changed, 178 insertions(+), 139 deletions(-) create mode 100644 src/mmpac/mmpac/pickm/card/btnClicks/borrowOkBtnClick.js diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js index c1cae895..ed23d753 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/borrowBtnClick.js @@ -2,10 +2,10 @@ import {ajax, base, toast} from 'nc-lightapp-front'; import {AREA, DIALOGCODE, FIELD, URL} from '../../constance'; import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; import PickmBorrowDlg from "../../pickmborrow/list"; +import {borrowOkBtnClick} from "./index"; let {NCModal, NCButton, NCTooltip, NCHotKeys} = base; -const TABLE_HEAD = 'borrow_list'; export default function borrowBtnClick(props, record) { let _this = this; this.props = {}; @@ -40,7 +40,7 @@ export default function borrowBtnClick(props, record) { success: res => { if (res.success && res.data) { let showData = res.data.data; - props.modal.show('BorrowDlg', { + props.modal.show(AREA.BORROW_DLG, { size: 'max', title: '借料入库明细', content: { - props.modal.close('BorrowDlg'); + props.modal.close(AREA.BORROW_DLG); } }); } } }); } - -function oKBtnClicks(props) { - let rowids = []; - let hids = []; - let hid; - let rows = props.table.getCheckedRows(TABLE_HEAD); - hid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; - hids.push(hid); - // 如果没有选中行，则提示并返回，不进行任何操作 - if (!rows || rows.length <= 0) { - showWarningInfo('请选择行'); - return; - } - for (let i = 0; i < rows.length; i++) { - rowids.push(rows[i].data.values.cpickm_bid.value); - } - let data = { - cpickmids: hids, - cpickmbids: rowids, - rows: rows - } - console.log('data = ', data); - ajax({ - url: URL.convertOtherIn, - data: data, - success: res => { - if (res.success && res.data) { - if (res.success) { - toast({color: 'success', title: "操作成功"}); - this.props.modal.close(TABLE_HEAD); - } - } - }, - error: (error) => { - toast({ - color: 'warning', - content: error.message - }); - } - }); -} diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/borrowOkBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/borrowOkBtnClick.js new file mode 100644 index 00000000..19ffb00c --- /dev/null +++ b/src/mmpac/mmpac/pickm/card/btnClicks/borrowOkBtnClick.js @@ -0,0 +1,62 @@ +import {ajax, base, toast} from 'nc-lightapp-front'; +import {AREA, FIELD, URL} from '../../constance'; +import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; + +let {NCModal, NCButton, NCTooltip, NCHotKeys} = base; + +export default function borrowOkBtnClick(props) { + let rowids = []; + let hids = []; + let hid; + let rows = this.props.editTable.getCheckedRows(AREA.borrowList); + hid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + hids.push(hid); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows || rows.length <= 0) { + showWarningInfo('请选择行'); + return; + } + for (let i = 0; i < rows.length; i++) { + rowids.push(rows[i].data.values.cpickm_bid.value); + } + let newRows = rows.map((item) => { + return { + cpickm_bid: item.data.values.cpickm_bid.value || '', + pk_batchcode: item.data.values.pk_batchcode.value || '', + vbatchcode: item.data.values.vbatchcode.value || '', + cprojectid: item.data.values.cprojectid.value || '', + cproductorid: item.data.values.cproductorid.value || '' + }; + }); + let data = { + cpickmids: hids, + cpickmbids: rowids, + rows: newRows + } + // console.log('data = ', data); + ajax({ + url: URL.convertOtherIn, + data: data, + success: res => { + if (res.success && res.data) { + // console.log('res.data = ', res.data); + let msg = ',单号：'; + if (res.data.data) { + msg = msg + res.data.data.map((item) => { + return item.parent.valueIndex.vbillcode; + }).join(','); + } else { + msg = ''; + } + toast({color: 'success', title: "操作成功" + msg}); + props.modal.close(AREA.BORROW_DLG); + } + }, + error: (error) => { + toast({ + color: 'warning', + content: error.message + }); + } + }); +} diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/index.js b/src/mmpac/mmpac/pickm/card/btnClicks/index.js index fe54c3c3..1d6bdff8 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/index.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/index.js @@ -24,10 +24,12 @@ import reserveBtnClick from './reserveBtnClick'; import reserveQueryBtnClick from './reserveQueryBtnClick'; import detailqueryBtnClick from './detailqueryBtnClick'; import pushrzmsBtnClick from './pushrzmsBtnClick.js'; //推送锐制 +import borrowBtnClick from './borrowBtnClick.js'; +import borrowOkBtnClick from "./borrowOkBtnClick.js"; export { pageInfoClick, getParentURlParme, setBtnShow, backBtnClick, addBtnClick, delBtnClick, editBtnClick, cancelBtnClick, saveBtnClick, saveCommitBtnClick, copyBtnClick, commitBtnClick, unCommitBtnClick, printBtnClick, outputBtnClick, subItemsBtnClick, finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick,detailqueryBtnClick, - pageInfoClickPage,pushrzmsBtnClick + pageInfoClickPage,pushrzmsBtnClick, borrowBtnClick, borrowOkBtnClick }; diff --git a/src/mmpac/mmpac/pickm/card/index.js b/src/mmpac/mmpac/pickm/card/index.js index 4bf1b47b..de0fc0f6 100644 --- a/src/mmpac/mmpac/pickm/card/index.js +++ b/src/mmpac/mmpac/pickm/card/index.js @@ -274,7 +274,7 @@ class PickmCard extends Component { {createModal('ReplaceDlg', {zIndex: "300"})} {createModal('BorrowDlg', {zIndex: "300"})} - {createModal(AREA.borrowMaterialDialog, { + {/*{createModal(AREA.borrowMaterialDialog, { title: '借料入库明细', content: (
@@ -317,7 +317,7 @@ class PickmCard extends Component { this.props.modal.close(AREA.borrowMaterialDialog) }, userControl: true - })} + })}*/}
@@ -389,7 +390,7 @@ class PickmList extends Component { this.props.modal.close('NCTable_3c81fe87') }, userControl: true - })} + })}*/}
); } diff --git a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js index 62fbe7f9..4349b1db 100644 --- a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js +++ b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js @@ -1,22 +1,36 @@ -import { LIST_BTN, PAGECODE, AREA, FIELD, UISTATE, URL, ListTabCode, PickmCache, PAGECARDCODE, DIALOGCODE, appcode } from '../../constance'; +import { + LIST_BTN, + PAGECODE, + AREA, + FIELD, + UISTATE, + URL, + ListTabCode, + PickmCache, + PAGECARDCODE, + DIALOGCODE, + appcode, FbillStatus +} from '../../constance'; import { commonSearch, searchBtnClick, deleteBtnClick, commitBtnClick, uncommitBtnClick, printBtnClick, outputBtnClick, finishBtnClick, unfinishBtnClick, clqueryBtnClick } from '../btnClicks/index'; -import { setDefData, getDefData } from '../../../../../mmpub/mmpub/pub/cache'; -import { pickmSetDeliver } from '../../../pub/pickmdeliverwithset'; -import { pickmBackDeliver } from '../../../pub/pickmbackdeliver'; -import { pickmBackDeliverWithSet } from '../../../pub/pickmbackdeliverwithset'; -import { clearTransferCache } from '../../../../../mmpub/mmpub/pub/cache'; -import { getLangByResId } from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -import { tableBeforeEdit } from '../../../../../mmpub/mmpub/pub/tool/listBeforeEditCardUtil'; +import {setDefData, getDefData} from '../../../../../mmpub/mmpub/pub/cache'; +import {pickmSetDeliver} from '../../../pub/pickmdeliverwithset'; +import {pickmBackDeliver} from '../../../pub/pickmbackdeliver'; +import {pickmBackDeliverWithSet} from '../../../pub/pickmbackdeliverwithset'; +import {clearTransferCache} from '../../../../../mmpub/mmpub/pub/cache'; +import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import {tableBeforeEdit} from '../../../../../mmpub/mmpub/pub/tool/listBeforeEditCardUtil'; import { showWarningInfo } from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; import listbuttonController from '../viewController/buttonController'; -import { updateCacheDataForList } from '../../../../../mmpub/mmpub/pub/cache'; -import { ajax, cacheTools,toast } from 'nc-lightapp-front'; +import {updateCacheDataForList} from '../../../../../mmpub/mmpub/pub/cache'; +import {ajax, cacheTools, toast} from 'nc-lightapp-front'; +import PickmBorrowDlg from "../../pickmborrow/list"; +import {borrowOkBtnClick} from "../../card/btnClicks"; export default function (props, key, text, record, index) { let pk = null; @@ -40,7 +54,7 @@ export default function (props, key, text, record, index) { searchBtnClick.call(this); break; case LIST_BTN.Add: // 新增 - props.pushTo(URL.cardURL, { status: UISTATE.add }); + props.pushTo(URL.cardURL, {status: UISTATE.add}); break; case LIST_BTN.Edit: // 修改 let canDoEdit = tableBeforeEdit.call( @@ -55,13 +69,11 @@ export default function (props, key, text, record, index) { if (canDoEdit) { let data; if (record && record.cpickmid) { - data = { cpickmid: record.cpickmid.value, pageid: PAGECARDCODE, appcode: props.getAppCode() }; - } - else { + data = {cpickmid: record.cpickmid.value, pageid: PAGECARDCODE, appcode: props.getAppCode()}; + } else { if (rows.length == 1) { - data = { cpickmid: rowsdata[0].pks, pageid: PAGECARDCODE }; - } - else { + data = {cpickmid: rowsdata[0].pks, pageid: PAGECARDCODE}; + } else { showWarningInfo(getLangByResId(this, '5008Pickm-000083'));/* 国际化处理： 请选中一行进行操作！*/ } } @@ -69,7 +81,7 @@ export default function (props, key, text, record, index) { url: URL.editCardInfoURL, data: data, success: (res) => { - props.pushTo(URL.cardURL, { status: UISTATE.edit, id: record.cpickmid.value }); + props.pushTo(URL.cardURL, {status: UISTATE.edit, id: record.cpickmid.value}); } }); } @@ -77,12 +89,10 @@ export default function (props, key, text, record, index) { case LIST_BTN.Copy: // 复制 if (record && record.cpickmid) { pk = record && record.cpickmid && record.cpickmid.value; - } - else { + } else { if (rows.length == 1) { pk = rowsdata[0].pks; - } - else { + } else { showWarningInfo(getLangByResId(this, '5008Pickm-000083'));/* 国际化处理： 请选中一行进行操作！*/ } } @@ -108,8 +118,7 @@ export default function (props, key, text, record, index) { cpickmid: record.cpickmid.value, vtrantypecode: record.vbusitype.value }); - } - else { + } else { let rows = props.table.getCheckedRows(AREA.tableArea); // 如果没有选中行，则提示并返回，不进行任何操作 if (rows.length <= 0) { @@ -142,7 +151,7 @@ export default function (props, key, text, record, index) { break; case LIST_BTN.LinkQuery: // 单据追溯 pk = this.props.table.getCheckedRows(AREA.tableArea)[0].data.values.cpickmid.value; - this.setState({ cpickmid: pk, showTrack: true }); + this.setState({cpickmid: pk, showTrack: true}); break; case LIST_BTN.Refresh: // 刷新 let tabCode = getDefData.call(this, PickmCache.PickmCacheKey, PickmCache.PickmListTabCode); @@ -452,11 +461,11 @@ export default function (props, key, text, record, index) { cpickmids: cpickmids } ajax({ - url:'/nccloud/mmpac/pickm/buyingreq.do', + url: '/nccloud/mmpac/pickm/buyingreq.do', data: data, success: (res) => { - if(res.success){ - toast({ content: "请购单推送成功", color: 'success' }); + if (res.success) { + toast({content: "请购单推送成功", color: 'success'}); } } }); @@ -473,6 +482,14 @@ export default function (props, key, text, record, index) { ); return; } + // 判断是否存在非审核通过状态的单据，存在则提示并返回 + for (let i = 0; i < rows.length; i++) { + let row = rows[i]; + if (row.data.values.fbillstatus.value != FbillStatus.approved) { + showWarningInfo('存在非审核通过状态的单据，请检查'); + return; + } + } rows.forEach((row) => { let pk = row.data.values.cpickmid.value; if (pk) { @@ -483,14 +500,28 @@ export default function (props, key, text, record, index) { data = { pks: cpickmids } + let setProps = (val) => { + this.props = val; + } ajax({ - url: '/nccloud/mmpac/pickm/pickmByIdsQuery.do', + url: URL.pickmIdsQuery, data: data, success: (res) => { - if(res.success){ - props.table.setAllTableData("NCTable_3c81fe87", res.data.data);//[0].card_body.rows - props.modal.show("NCTable_3c81fe87"); - toast({ content: "查询成功", color: 'success' }); + if (res.success) { + let showData = res.data.data; + props.modal.show(AREA.BORROW_DLG, { + size: 'max', + title: '借料入库明细', + content: , + userControl: true, + // leftBtnName: '', + // rightBtnName: getLangByResId(this, '5008Pickm-000013'),/* 国际化处理： 取消*/ + beSureBtnClick: borrowOkBtnClick.bind(this, props, true), + cancelBtnClick: () => { + props.modal.close(AREA.BORROW_DLG); + } + }); } } }); @@ -521,8 +552,8 @@ export default function (props, key, text, record, index) { url: '/nccloud/mmpac/pickm/pom.do', data: data, success: (res) => { - if(res.success){ - toast({ content: "流程生产订单推送成功", color: 'success' }); + if (res.success) { + toast({content: "流程生产订单推送成功", color: 'success'}); } } }); diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js index 7e1ea810..682bad88 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js @@ -1,4 +1,6 @@ +import {AREA} from "../../../constance"; + export default async function headAfterEvent(props, moduleId, key, value, changedrows, i) { - let headData = props.editTable.getAllData('replace_head', true); - this.props.setHeadDatas(headData); + // let headData = props.editTable.getAllData(AREA.borrowList, true); + // this.props.setHeadDatas(headData); } diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js index 6784f955..fd9caa95 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js @@ -1,15 +1,14 @@ - export default function headBeforeEvent(props, moduleId, item, index, value, record) { let key = item.attrcode; let editFields = ['freplacetype']; if (!editFields.includes(key)) { return false; - } - else if (key == 'freplacetype') { + } else if (key == 'freplacetype') { //以替代的备料计划表体不能修改替代类型 let replaceInfo = props.editTable.getValByKeyAndIndex(moduleId, index, 'freplaceinfo').value; if (replaceInfo == 2) { return false; } - } return true; + } + return true; } diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/index.js b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js index 63239f01..4eaa78fd 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/index.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js @@ -3,16 +3,15 @@ import {base, createPage, high} from 'nc-lightapp-front'; import {initTemplate} from './init'; import {initLang} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; import {headAfterEvent} from './events'; -import {DIALOGCODE} from "../../constance"; +import {DIALOGCODE, AREA} from "../../constance"; const {Refer} = high; const {NCModal} = base; -const TABLE_HEAD = 'borrow_list'; class PickmBorrowDlg extends Component { constructor(props) { super(props); - props.use.editTable(TABLE_HEAD); + props.use.editTable(AREA.borrowList); this.state = { totalRepNum: {} }; @@ -26,7 +25,7 @@ class PickmBorrowDlg extends Component { //请求列表数据 initData = () => { let showdata = this.props.showdata; - this.props.editTable.setTableData(TABLE_HEAD, showdata.borrow_list); + this.props.editTable.setTableData(AREA.borrowList, showdata.borrow_list); this.props.setProps(this.props); }; @@ -35,15 +34,15 @@ class PickmBorrowDlg extends Component { let {createEditTable} = editTable; return
- {createEditTable(TABLE_HEAD, { - showIndex: true, + {createEditTable(AREA.borrowList, { + showIndex: false, // height: 100, // onRowClick: this.onRowClick.bind(this), // onRowDoubleClick: this.onRowDoubleClick.bind(this), // onBeforeEvent: headBeforeEvent.bind(this), onAfterEvent: headAfterEvent.bind(this), isAddRow: false, - showCheck: false + showCheck: true })}
; diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js b/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js index 92841d5a..11e36f1b 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/init/initTemplate.js @@ -1,43 +1,25 @@ -import { DIALOGCODE } from '../../../constance'; -import { getLangByResId } from '../../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -const TABLE_HEAD = 'borrow_list'; +import {DIALOGCODE, AREA} from '../../../constance'; export default function (props) { - let appcode = props.getAppCode(); - if (props.getAppCode().startsWith('5009')) { - appcode = '50090102'; - } - else if (props.getAppCode().startsWith('5008')) { - appcode = '50080102'; - } - //请求模板数据 - props.createUIDom( - { - appcode: appcode, - pagecode: DIALOGCODE.BORROWDLG - }, - (templedata) => { - if (templedata.template) { - let meta = templedata.template; - // modifierMeta.call(this, this.props, meta); - props.meta.setMeta(meta); - props.editTable.setStatus(TABLE_HEAD, 'edit'); - // props.editTable.setStatus(TABLE_BODY, 'edit'); - } - }); -} -function modifierMeta(props, meta) { - meta[TABLE_HEAD].items.map((item) => { - if (item.attrcode == 'freplacetype') { - item.options = [{ - display: getLangByResId(this, '5008Pickm-000096')/* 国际化处理： "全部替代"*/, - value: "1" - }, { - display: getLangByResId(this, '5008Pickm-000097')/* 国际化处理： ""部分替代"*/, - value: "2" - } - ]; - } - }); - return meta; + let appcode = props.getAppCode(); + if (props.getAppCode().startsWith('5009')) { + appcode = '50090102'; + } else if (props.getAppCode().startsWith('5008')) { + appcode = '50080102'; + } + //请求模板数据 + props.createUIDom( + { + appcode: appcode, + pagecode: DIALOGCODE.BORROWDLG + }, + (templedata) => { + if (templedata.template) { + let meta = templedata.template; + // modifierMeta.call(this, this.props, meta); + props.meta.setMeta(meta); + props.editTable.setStatus(AREA.borrowList, 'edit'); + // props.editTable.setStatus(TABLE_BODY, 'edit'); + } + }); } From 667ee05eb9fd21b337e2b1143146e1096590d749 Mon Sep 17 00:00:00 2001 From: mzr Date: Sun, 7 Sep 2025 18:04:16 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/btnClicks/detailqueryBtnClick.js | 100 ------------------ src/mmpac/mmpac/pickm/card/btnClicks/index.js | 3 +- .../card/viewController/btnClickControllor.js | 39 +++---- 3 files changed, 18 insertions(+), 124 deletions(-) delete mode 100644 src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js deleted file mode 100644 index 09a670fc..00000000 --- a/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js +++ /dev/null @@ -1,100 +0,0 @@ -import {ajax, toast} from 'nc-lightapp-front'; -import {AREA, URL, DIALOGCODE, FIELD} from '../../constance'; -import {initLang, getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -import PickmCLQueryDlg from '../../pickmclquery/list'; -import {showErrorInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; - -export default function detailqueryBtnClick(props, record) { - let _this = this; - let bids = []; - let hid; - let rows = this.props.cardTable.getCheckedRows(AREA.bodyTable); - // 如果没有选中行，则提示并返回，不进行任何操作 - if (!rows) { - return; - } - if (rows.length <= 0) { - hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; - } else { - rows.map((item) => { - let cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; - bids.push(cpickm_bid); - }); - } - doQuery.call(this, props, hid, bids, rows); - -} - -function doQuery(props, hid, bids, rows) { - let appcode = props.getAppCode(); - - ajax({ - url: '/nccloud/mmpac/pickm/pickmItemsQuery.do', - data: { - cpickmid: hid, - cpickmbids: bids, - pageid: DIALOGCODE.CLQUERYDLG, - appcode: appcode - }, - success: res => { - let bids = res.data.data; - // console.log('bids = ', bids); - let rows1 = []; - rows.map((item) => { - let values = item.data.values; - // 借料数量 = 计划出库数量-累计出库数量-累计发货数量-累计委外数量，所有数值用getNumber处理null转0 - values.borrowedQty = { - value: getNumber(values.nplanoutastnum) - getNumber(values.naccoutastnum) - - getNumber(values.nshouldastnum) - getNumber(values.npscastnum) - }; - let def26 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid").value; - // let def27 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid.name").value; - let form = this.props.form.getAllFormValue(AREA.formArea); - // values.cmaterialvid = { - // value: def26 - // }; - values.cmaterialvid = form.rows[0].values["cmaterialvid"]; - values.cmaterialvidName = { - value: form.rows[0].values["cmaterialvid.name"].value - }; - if(undefined !=form.rows[0].values["cmaterialvid.def26"]){ - values.cmaterialvidDef26 = { - value: form.rows[0].values["cmaterialvid.def26"].value - }; - } - let rowItem = { - isOptimized: false, - status: '0', - values: values - }; - // 确保 bids 是数组类型 - if (!Array.isArray(bids)) { - bids = [bids]; - } - // 筛选出未生成的行 - // console.log('values.cpickm_bid = ', values.cpickm_bid.value); - // console.log('values.indexOf = ', bids.indexOf(values.cpickm_bid.value)); - if (values.cpickm_bid && values.cpickm_bid.value && (bids.indexOf(values.cpickm_bid.value) > -1) && values.borrowedQty.value>0) { - rows1.push(rowItem); - } - }); - let data = { - areacode: 'clquery', - rows: rows1 - }; - // console.log('rows = ', rows); - // console.log('data = ', data); - props.table.setAllTableData(AREA.borrowMaterialDialog, data); - props.modal.show(AREA.borrowMaterialDialog); - } - }); -} - -// 本地安全数值转换方法，null/undefined/空对象转0 -function getNumber(data) { - if (data && data.value != null) { - return +data.value; - } else { - return 0; - } -} diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/index.js b/src/mmpac/mmpac/pickm/card/btnClicks/index.js index 1d6bdff8..cf30b411 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/index.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/index.js @@ -22,7 +22,6 @@ import clqueryBtnClick from './clqueryBtnClick';//存量查询 import replaceBtnClick from './replaceBtnClick'; import reserveBtnClick from './reserveBtnClick'; import reserveQueryBtnClick from './reserveQueryBtnClick'; -import detailqueryBtnClick from './detailqueryBtnClick'; import pushrzmsBtnClick from './pushrzmsBtnClick.js'; //推送锐制 import borrowBtnClick from './borrowBtnClick.js'; import borrowOkBtnClick from "./borrowOkBtnClick.js"; @@ -30,6 +29,6 @@ export { pageInfoClick, getParentURlParme, setBtnShow, backBtnClick, addBtnClick, delBtnClick, editBtnClick, cancelBtnClick, saveBtnClick, saveCommitBtnClick, copyBtnClick, commitBtnClick, unCommitBtnClick, printBtnClick, outputBtnClick, subItemsBtnClick, - finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick,detailqueryBtnClick, + finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick, pageInfoClickPage,pushrzmsBtnClick, borrowBtnClick, borrowOkBtnClick }; diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index caaa88c3..a2d155b9 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -1,28 +1,28 @@ import { - backBtnClick, addBtnClick, + backBtnClick, + cancelBtnClick, + clqueryBtnClick, + commitBtnClick, + copyBtnClick, delBtnClick, editBtnClick, - cancelBtnClick, - saveBtnClick, - saveCommitBtnClick, - copyBtnClick, - commitBtnClick, - unCommitBtnClick, - printBtnClick, - outputBtnClick, - subItemsBtnClick, finishBtnClick, - unfinishBtnClick, - clqueryBtnClick, - replaceBtnClick, + outputBtnClick, pageInfoClick, + printBtnClick, + pushrzmsBtnClick, + replaceBtnClick, reserveBtnClick, reserveQueryBtnClick, - detailqueryBtnClick,pushrzmsBtnClick -} from '../btnClicks';// + saveBtnClick, + saveCommitBtnClick, + subItemsBtnClick, + unCommitBtnClick, + unfinishBtnClick +} from '../btnClicks'; // import newLineDefaultUtil from '../utils/newLineDefaultUtil'; -import {CARD_BTN, AREA, URL, PAGECARDCODE, FIELD, UISTATE, DIALOGCODE, PickmCache, appcode} from '../../constance'; +import {AREA, CARD_BTN, DIALOGCODE, FIELD, PAGECARDCODE, PickmCache, UISTATE, URL} from '../../constance'; import {RownoUtils} from '../../../../../mmpub/mmpub/pub/tool/cardTableTools'; import {rowCopyPasteUtils} from '../utils/rowCopyPasteUtils'; import {checkDeleteRows} from '../utils/rowDeleteUtil'; @@ -31,12 +31,7 @@ import {ajax, cacheTools} from 'nc-lightapp-front'; import {setBtnShow} from '../btnClicks/pageInfoClick'; import {pickmSetDeliver} from '../../../pub/pickmdeliverwithset'; import {updateCacheData} from '../../../../../mmpub/mmpub/pub/cache/cacheDataManager'; -import { - showSuccessInfo, - showErrorInfo, - showWarningInfo, - showWarningDialog -} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; +import {showWarningInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; import {pickmBackDeliver} from '../../../pub/pickmbackdeliver'; import {pickmTakeOver} from '../../../pub/pickmtakeover'; import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; From aefc9676a4d4c2475ae27caa9d7f8250670b7c1f Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 8 Sep 2025 10:42:51 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=A1=B5=E4=B8=8B=E8=BE=BE=E8=AF=B7=E8=B4=AD?= =?UTF-8?q?=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/viewController/btnClickControllor.js | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index a2d155b9..86afbc81 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -827,6 +827,47 @@ export default async function clickBtn(props, id, text, record, index) { case CARD_BTN.pushrzmes: pushrzmsBtnClick.call(this, props); break; + case "to_buying"://请购 + hids = []; + cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + if (cpickmid) { + hids.push(cpickmid); + } + data = { + cpickmids: hids + } + ajax({ + url:'/nccloud/mmpac/pickm/buyingreq.do', + data: data, + success: (res) => { + if(res.success){ + toast({ content: "请购单推送成功", color: 'success' }); + } + } + }); + break; + case "to_pmo"://流程生产订单 + hids = []; + cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + if (cpickmid) { + hids.push(cpickmid); + } + data = { + cpickmids: hids + } + data = { + cpickmids: cpickmids + } + ajax({ + url: '/nccloud/mmpac/pickm/pom.do', + data: data, + success: (res) => { + if(res.success){ + toast({ content: "流程生产订单推送成功", color: 'success' }); + } + } + }); + break default: break; } From a7c27a15292cbea8d6b286b9bcf7300ec360d6c8 Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 8 Sep 2025 13:55:06 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=A1=B5=E4=B8=8B=E8=BE=BE=E8=AF=B7=E8=B4=AD?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=BC=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/viewController/btnClickControllor.js | 75 ++++++----- .../viewController/buttonClickController.js | 122 ++++++++++-------- 2 files changed, 114 insertions(+), 83 deletions(-) diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index 86afbc81..b2fcbad4 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -38,6 +38,7 @@ import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil' import {pickmBackDeliverWithSet} from '../../../pub/pickmbackdeliverwithset'; import {toast} from "../../../../../gl/public/components/utils"; import borrowBtnClick from "../btnClicks/borrowBtnClick"; +import {showWarningDialog} from "../../../../../scmpub/scmpub/pub/tool/messageUtil"; export default async function clickBtn(props, id, text, record, index) { let _this = this; @@ -828,45 +829,57 @@ export default async function clickBtn(props, id, text, record, index) { pushrzmsBtnClick.call(this, props); break; case "to_buying"://请购 - hids = []; - cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; - if (cpickmid) { - hids.push(cpickmid); - } - data = { - cpickmids: hids - } - ajax({ - url:'/nccloud/mmpac/pickm/buyingreq.do', - data: data, - success: (res) => { - if(res.success){ - toast({ content: "请购单推送成功", color: 'success' }); + showWarningDialog("是否确定下达请购", "", { + /* 国际化处理： 确认终止,是否确定将此合同终止*/ + beSureBtnClick: () => { + hids = []; + cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + if (cpickmid) { + hids.push(cpickmid); } + data = { + cpickmids: hids + } + ajax({ + url:'/nccloud/mmpac/pickm/buyingreq.do', + data: data, + success: (res) => { + if(res.success){ + toast({ content: "请购单推送成功", color: 'success' }); + } + } + }); } }); + break; case "to_pmo"://流程生产订单 - hids = []; - cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; - if (cpickmid) { - hids.push(cpickmid); - } - data = { - cpickmids: hids - } - data = { - cpickmids: cpickmids - } - ajax({ - url: '/nccloud/mmpac/pickm/pom.do', - data: data, - success: (res) => { - if(res.success){ - toast({ content: "流程生产订单推送成功", color: 'success' }); + showWarningDialog("是否确定下达生产", "", { + /* 国际化处理： 确认终止,是否确定将此合同终止*/ + beSureBtnClick: () => { + hids = []; + cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + if (cpickmid) { + hids.push(cpickmid); } + data = { + cpickmids: hids + } + data = { + cpickmids: cpickmids + } + ajax({ + url: '/nccloud/mmpac/pickm/pom.do', + data: data, + success: (res) => { + if(res.success){ + toast({ content: "流程生产订单推送成功", color: 'success' }); + } + } + }); } }); + break default: break; diff --git a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js index 4349b1db..2a5303e0 100644 --- a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js +++ b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js @@ -31,6 +31,13 @@ import {updateCacheDataForList} from '../../../../../mmpub/mmpub/pub/cache'; import {ajax, cacheTools, toast} from 'nc-lightapp-front'; import PickmBorrowDlg from "../../pickmborrow/list"; import {borrowOkBtnClick} from "../../card/btnClicks"; +import {showWarningDialog} from "../../../../../scmpub/scmpub/pub/tool/messageUtil"; +import {FIELDS} from "../../../../../ct/ct/purdaily/constance"; +import { + cardBaseScriptAction, + isShowScriptActionDlg, + showCardScriptActionDlg +} from "../../../../../ct/ct/purdaily/utils/baseScriptUtil"; export default function (props, key, text, record, index) { let pk = null; @@ -439,34 +446,39 @@ export default function (props, key, text, record, index) { }); break; case "to_buying"://请购 - cpickmids = []; - if (record && record.cpickmid) { - cpickmids.push(record.cpickmid); - } else { - let rows = _this.props.table.getCheckedRows(AREA.tableArea); - // 如果没有选中行，则提示并返回，不进行任何操作 - if (rows.length <= 0) { - showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068') 国际化处理： 请选择需要删除的数据！*/ - ); - return; - } - rows.forEach((row) => { - let pk = row.data.values.cpickmid.value; - if (pk) { - cpickmids.push(pk); + showWarningDialog("是否确定下达请购", "", { + /* 国际化处理： 确认终止,是否确定将此合同终止*/ + beSureBtnClick: () => { + cpickmids = []; + if (record && record.cpickmid) { + cpickmids.push(record.cpickmid); + } else { + let rows = _this.props.table.getCheckedRows(AREA.tableArea); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (rows.length <= 0) { + showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068') 国际化处理： 请选择需要删除的数据！*/ + ); + return; + } + rows.forEach((row) => { + let pk = row.data.values.cpickmid.value; + if (pk) { + cpickmids.push(pk); + } + }); } - }); - } - data = { - cpickmids: cpickmids - } - ajax({ - url: '/nccloud/mmpac/pickm/buyingreq.do', - data: data, - success: (res) => { - if (res.success) { - toast({content: "请购单推送成功", color: 'success'}); + data = { + cpickmids: cpickmids } + ajax({ + url: '/nccloud/mmpac/pickm/buyingreq.do', + data: data, + success: (res) => { + if (res.success) { + toast({content: "请购单推送成功", color: 'success'}); + } + } + }); } }); break; @@ -527,36 +539,42 @@ export default function (props, key, text, record, index) { }); break; case "to_pmo"://流程生产订单 - cpickmids = []; - if (record && record.cpickmid) { - cpickmids.push(record.cpickmid); - } else { - let rows = _this.props.table.getCheckedRows(AREA.tableArea); - // 如果没有选中行，则提示并返回，不进行任何操作 - if (rows.length <= 0) { - showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068') 国际化处理： 请选择需要删除的数据！*/ - ); - return; - } - rows.forEach((row) => { - let pk = row.data.values.cpickmid.value; - if (pk) { - cpickmids.push(pk); + showWarningDialog("是否确定下达生产", "", { + /* 国际化处理： 确认终止,是否确定将此合同终止*/ + beSureBtnClick: () => { + cpickmids = []; + if (record && record.cpickmid) { + cpickmids.push(record.cpickmid); + } else { + let rows = _this.props.table.getCheckedRows(AREA.tableArea); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (rows.length <= 0) { + showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068') 国际化处理： 请选择需要删除的数据！*/ + ); + return; + } + rows.forEach((row) => { + let pk = row.data.values.cpickmid.value; + if (pk) { + cpickmids.push(pk); + } + }); } - }); - } - data = { - cpickmids: cpickmids - } - ajax({ - url: '/nccloud/mmpac/pickm/pom.do', - data: data, - success: (res) => { - if (res.success) { - toast({content: "流程生产订单推送成功", color: 'success'}); + data = { + cpickmids: cpickmids } + ajax({ + url: '/nccloud/mmpac/pickm/pom.do', + data: data, + success: (res) => { + if (res.success) { + toast({content: "流程生产订单推送成功", color: 'success'}); + } + } + }); } }); + break; default: break; From 5ce7b64172c8d5d2cfd7b251abf713d0f5e5d514 Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 8 Sep 2025 14:07:02 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=A1=B5=E4=B8=8B=E8=BE=BE=E8=AF=B7=E8=B4=AD?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=BC=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/card/viewController/btnClickControllor.js | 4 ++-- .../mmpac/pickm/list/viewController/buttonClickController.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index b2fcbad4..93555181 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -829,7 +829,7 @@ export default async function clickBtn(props, id, text, record, index) { pushrzmsBtnClick.call(this, props); break; case "to_buying"://请购 - showWarningDialog("是否确定下达请购", "", { + showWarningDialog("是否生成请购单", "", { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { hids = []; @@ -854,7 +854,7 @@ export default async function clickBtn(props, id, text, record, index) { break; case "to_pmo"://流程生产订单 - showWarningDialog("是否确定下达生产", "", { + showWarningDialog("是否生成生产订单", "", { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { hids = []; diff --git a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js index 2a5303e0..c1250b76 100644 --- a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js +++ b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js @@ -446,7 +446,7 @@ export default function (props, key, text, record, index) { }); break; case "to_buying"://请购 - showWarningDialog("是否确定下达请购", "", { + showWarningDialog("是否生成请购单", "", { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { cpickmids = []; @@ -539,7 +539,7 @@ export default function (props, key, text, record, index) { }); break; case "to_pmo"://流程生产订单 - showWarningDialog("是否确定下达生产", "", { + showWarningDialog("是否生成生产订单", "", { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { cpickmids = []; From 2333e9555c5dad57c7f161e47e1c2c84d6436a48 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 8 Sep 2025 15:23:18 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93-?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=8F=82=E8=80=83=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mmpac/mmpac/pickm/constance/index.js | 53 ++++++++++--------- .../pickmborrow/list/events/headAfterEvent.js | 15 ++++-- .../list/events/headBeforeEvent.js | 15 ++++-- .../mmpac/pickm/pickmborrow/list/index.js | 4 +- 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/src/mmpac/mmpac/pickm/constance/index.js b/src/mmpac/mmpac/pickm/constance/index.js index 935b3eff..1bff2215 100644 --- a/src/mmpac/mmpac/pickm/constance/index.js +++ b/src/mmpac/mmpac/pickm/constance/index.js @@ -10,7 +10,7 @@ const AREA = { cardHeadBtnArea: 'card_head', //卡片表头按钮区域 cardBodyBtnArea: 'card_body', //卡片表体按钮区域 cardBodyInnerBtnArea: 'card_body_inner', //卡片表体操作按钮区域 - borrowMaterialDialog: 'NCTable_83c3abf9', //借料弹窗 + // borrowMaterialDialog: 'NCTable_83c3abf9', //借料弹窗 borrowList: 'borrow_list', //借料弹窗页面编码 BORROW_DLG: 'BorrowDlg' //借料入库 }; @@ -71,13 +71,13 @@ const CARD_BTN = { Refresh: 'Refresh',//刷新 drop_more: 'drop_more', - pushrzmes:'pushrzmes',//推送锐制 + pushrzmes: 'pushrzmes',//推送锐制 PickmDelivery: 'PickmDelivery',//领料 PickmDeliveryWithSet: 'PickmDeliveryWithSet',//成套领料 PickmReDeliveryWithSet: 'PickmReDeliveryWithSet',//补成套领料 ToReqPickm: 'ToReqPickm',//备料 - + toOtherWarehouse: 'toOtherWarehouse',//其他入库 DirectTrans: 'DirectTrans',//直接备料 PickmBackDelivery: 'PickmBackDelivery',//退料 @@ -203,7 +203,7 @@ const URL = { setBackDeliverQueryURL: '/nccloud/mmpac/pickm/setbackdeliverquery.do', setBackDeliverComputURL: '/nccloud/mmpac/pickm/setbackdelivercomput.do', checkToReqpickm: '/nccloud/mmpac/pickm/checktoreqpickm.do', - checkToDirectTrans:'/nccloud/mmpac/pickm/checktoDirectTrans.do', + checkToDirectTrans: '/nccloud/mmpac/pickm/checktoDirectTrans.do', toReqpickm: '/reqpickm', noItemDeliverQueryURL: '/nccloud/mmpac/pickm/noitemdeliverquery.do', noItemDeliverURL: '/nccloud/mmpac/pickm/noitemdeliver.do', @@ -212,13 +212,13 @@ const URL = { replaceQueryURL: '/nccloud/mmpac/pickm/replaceQuery.do', replaceBodyQueryURL: '/nccloud/mmpac/pickm/replaceBodyQuery.do', replaceDoURL: '/nccloud/mmpac/pickm/replace.do', - replaceAutoMatchURL:'/nccloud/mmpac/pickm/replaceAutoMatch.do', + replaceAutoMatchURL: '/nccloud/mmpac/pickm/replaceAutoMatch.do', deleteLineURL: '/nccloud/mmpac/pickm/deleteline.do', - queryByCondURL:'/nccloud/mmpac/pickm/queryByCond.do', - convertOtherIn:'/nccloud/mmpac/pickm/convertOtherIn.do', - pickmItemsQuery:'/nccloud/mmpac/pickm/pickmItemsQuery.do', - pickmIdsQuery:'/nccloud/mmpac/pickm/pickmByIdsQuery.do', - pushrzmsURL:'/nccloud/mmpac/pickm/pushrzmes.do' + queryByCondURL: '/nccloud/mmpac/pickm/queryByCond.do', + convertOtherIn: '/nccloud/mmpac/pickm/convertOtherIn.do', + pickmItemsQuery: '/nccloud/mmpac/pickm/pickmItemsQuery.do', + pickmIdsQuery: '/nccloud/mmpac/pickm/pickmByIdsQuery.do', + pushrzmsURL: '/nccloud/mmpac/pickm/pushrzmes.do' }; const tabURL = '/list'; @@ -259,6 +259,7 @@ const FIELD = { cbastunitid: 'cbastunitid', vbatchcode: 'vbatchcode', vsrcid: 'vsrcid', //来源单据id + pk_group: 'pk_group', //集团 }; //表头不可修改字段 const headDisableFields = [ @@ -481,24 +482,24 @@ let clearItems = [ 'vfree10' ]; const headfixAssts = [ - 'cvendorid', - 'cvendorvid', - 'cproductorid', - 'cprojectid', - 'ccustomerid', - 'ccustomervid' - // 'cqualitylevelid', - //'cffileid' + 'cvendorid', + 'cvendorvid', + 'cproductorid', + 'cprojectid', + 'ccustomerid', + 'ccustomervid' + // 'cqualitylevelid', + //'cffileid' ]; const bodyfixAssts = [ - 'cbvendorid', - 'cbvendorvid', - 'cbproductorid', - 'cbprojectid', - 'cbcustomerid', - 'cbcustomervid' - // 'cbqualitylevelid', - //'cbffileid' + 'cbvendorid', + 'cbvendorvid', + 'cbproductorid', + 'cbprojectid', + 'cbcustomerid', + 'cbcustomervid' + // 'cbqualitylevelid', + //'cbffileid' ]; const headCustAndSupFild = { ccustomerid: 'ccustomerid', diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js index 682bad88..358f1aac 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headAfterEvent.js @@ -1,6 +1,15 @@ -import {AREA} from "../../../constance"; +import {AREA, FIELD} from "../../../constance"; export default async function headAfterEvent(props, moduleId, key, value, changedrows, i) { - // let headData = props.editTable.getAllData(AREA.borrowList, true); - // this.props.setHeadDatas(headData); + // console.log('value = ', value); + if (key == FIELD.vbatchcode) { + if (value.length > 0) { + let firstElement = value[0]; + let vbatchcode = firstElement.values.vbatchcode.value; + let pk_batchcode = firstElement.values.pk_batchcode.value; + props.editTable.setValByKeyAndIndex(moduleId, i, key, {value: vbatchcode, display: vbatchcode}); + props.editTable.setValByKeyAndIndex(moduleId, i, 'pk_batchcode', {value: pk_batchcode, display: null}); + } + + } } diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js index fd9caa95..339e5a8f 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/events/headBeforeEvent.js @@ -1,14 +1,19 @@ +import {FIELD} from "../../../constance"; +import {processBatchCodeItem} from "../../../../wr/card/util/batchCodeUtil"; + export default function headBeforeEvent(props, moduleId, item, index, value, record) { let key = item.attrcode; - let editFields = ['freplacetype']; + let editFields = ['vbatchcode']; if (!editFields.includes(key)) { return false; - } else if (key == 'freplacetype') { - //以替代的备料计划表体不能修改替代类型 - let replaceInfo = props.editTable.getValByKeyAndIndex(moduleId, index, 'freplaceinfo').value; - if (replaceInfo == 2) { + } else if (key == FIELD.vbatchcode) { + let cmaterialvid = props.editTable.getValByKeyAndIndex(moduleId, index, FIELD.cmaterialvid).value; + //物料为空直接返回false 不可编辑 + if (!cmaterialvid) { + toast({content: '缺少物料编码', color: 'warning'}); return false; } + processBatchCodeItem.call(this, props, moduleId, key, record, '4A', false); } return true; } diff --git a/src/mmpac/mmpac/pickm/pickmborrow/list/index.js b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js index 4eaa78fd..1d950271 100644 --- a/src/mmpac/mmpac/pickm/pickmborrow/list/index.js +++ b/src/mmpac/mmpac/pickm/pickmborrow/list/index.js @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import {base, createPage, high} from 'nc-lightapp-front'; import {initTemplate} from './init'; import {initLang} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -import {headAfterEvent} from './events'; +import {headAfterEvent, headBeforeEvent} from './events'; import {DIALOGCODE, AREA} from "../../constance"; const {Refer} = high; @@ -39,7 +39,7 @@ class PickmBorrowDlg extends Component { // height: 100, // onRowClick: this.onRowClick.bind(this), // onRowDoubleClick: this.onRowDoubleClick.bind(this), - // onBeforeEvent: headBeforeEvent.bind(this), + onBeforeEvent: headBeforeEvent.bind(this), onAfterEvent: headAfterEvent.bind(this), isAddRow: false, showCheck: true From 24388ef42a5e14e36979163d947b8cb7fa59b9dc Mon Sep 17 00:00:00 2001 From: lihao Date: Tue, 9 Sep 2025 14:02:31 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=B0=86=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BA=E2=80=9C=E5=86=85=E9=85=8D?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E2=80=9D=E7=9A=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E7=85=A7=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81+=E9=A1=B9=E7=9B=AE=E5=8F=B7=E5=90=91PLM=20=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E8=AE=BE=E8=AE=A1=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js | 37 +++++++++++++++++++ .../card/viewControl/btnClickController.js | 7 ++++ 2 files changed, 44 insertions(+) create mode 100644 src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js diff --git a/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js b/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js new file mode 100644 index 00000000..2ee10ace --- /dev/null +++ b/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js @@ -0,0 +1,37 @@ +/*QwCcdu/06Kz5BGRJW8BXmE2Xrjmp0WZMN+2Dwfbg+BI=*/ +/* + * @Author: + * @PageInfo: 卡片新增按钮事件 + * @Date: 2018-04-19 10:38:05 + * @Last Modified by: + * @Last Modified time: 2019-03-06 15:28:59 + */ +// import { PMO_CARD, HEADATTRCODE } from '../../pmoconst'; +import { PMO_LIST, PMO_CARD, BODYATTRCODE } from '../../pmoconst'; +import { ajax } from 'nc-lightapp-front'; +import { showSuccessInfo, showErrorInfo, showWarningInfo } from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; +import { getLangByResId } from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import { bodyCheckedRow } from '../util/bodySelectedUtils'; +import pageInfoClick from './pageInfoClick'; +import {toast} from "../../../../../gl/public/components/utils"; + +import {toast} from "../../../../../gl/public/components/utils"; +const formId = PMO_CARD.formId; +export default function toPlm(props, saveAdd) { + + let rowids = []; + rowids[0]=formId; + ajax({ + url: '/nccloud/mmpac/pmo/checkMos.do', + data: { pks: rowids }, + success: (res) => { + if (res.success) { + // if (res.data) { + toast({ content: "传递设计任务成功", color: 'success' }); + // } + } + } + }); +} + +/*QwCcdu/06Kz5BGRJW8BXmE2Xrjmp0WZMN+2Dwfbg+BI=*/ \ No newline at end of file diff --git a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js index 61739035..89c4fc70 100644 --- a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js +++ b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js @@ -52,6 +52,7 @@ import batchEditSave from '../btnClicks/batchEditSave'; import batchEditServ from '../../pub/batchedit/service/batchEditServ'; import exportTemClick from '../btnClicks/exportTemClick'; //导出 import importClick from '../btnClicks/importClick'; //导入 +import toPlm from '../btnClicks/toPlm'; //传递设计任务 import { PMO_LIST, PMO_CARD, @@ -631,6 +632,12 @@ export default function clickBtn(props, id, text, record, index) { let importC = importClick.bind(this, props, id); return importC(props); } + case "pushToPlm":{ + // 传递设计任务 +//导入 + let toPlm = toPlm.bind(this, props, id); + return toPlm(props); + } } } From f585ca6a2d226bad8ca4a71b6273f56dfbc32afa Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 9 Sep 2025 16:00:17 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=86=85=E9=85=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A8PLM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js | 48 +- .../card/viewControl/btnClickController.js | 1162 ++++++++--------- src/mmpac/mmpac/pmo/pmoconst/pmoconst.js | 6 +- 3 files changed, 598 insertions(+), 618 deletions(-) diff --git a/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js b/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js index 2ee10ace..381ab421 100644 --- a/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js +++ b/src/mmpac/mmpac/pmo/card/btnClicks/toPlm.js @@ -1,37 +1,25 @@ -/*QwCcdu/06Kz5BGRJW8BXmE2Xrjmp0WZMN+2Dwfbg+BI=*/ /* - * @Author: - * @PageInfo: 卡片新增按钮事件 - * @Date: 2018-04-19 10:38:05 - * @Last Modified by: + * @Author: + * @PageInfo: 卡片推PLM按钮事件 + * @Date: 2018-04-19 10:38:05 + * @Last Modified by: * @Last Modified time: 2019-03-06 15:28:59 */ // import { PMO_CARD, HEADATTRCODE } from '../../pmoconst'; -import { PMO_LIST, PMO_CARD, BODYATTRCODE } from '../../pmoconst'; -import { ajax } from 'nc-lightapp-front'; -import { showSuccessInfo, showErrorInfo, showWarningInfo } from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; -import { getLangByResId } from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -import { bodyCheckedRow } from '../util/bodySelectedUtils'; -import pageInfoClick from './pageInfoClick'; +import {PMO_CARD, URL} from '../../pmoconst'; +import {ajax} from 'nc-lightapp-front'; import {toast} from "../../../../../gl/public/components/utils"; -import {toast} from "../../../../../gl/public/components/utils"; -const formId = PMO_CARD.formId; -export default function toPlm(props, saveAdd) { - - let rowids = []; - rowids[0]=formId; - ajax({ - url: '/nccloud/mmpac/pmo/checkMos.do', - data: { pks: rowids }, - success: (res) => { - if (res.success) { - // if (res.data) { - toast({ content: "传递设计任务成功", color: 'success' }); - // } - } - } - }); +export default function toPlm(props, id) { + let rowIds = []; + rowIds[0] = id; + ajax({ + url: URL.toPlmURL, + data: {pks: rowIds}, + success: (res) => { + if (res.success) { + toast({content: "传递设计任务成功", color: 'success'}); + } + } + }); } - -/*QwCcdu/06Kz5BGRJW8BXmE2Xrjmp0WZMN+2Dwfbg+BI=*/ \ No newline at end of file diff --git a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js index 89c4fc70..11ba2bbb 100644 --- a/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js +++ b/src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js @@ -2,7 +2,7 @@ /*** * fengjinga */ -import { ajax, cardCache, toast } from 'nc-lightapp-front'; +import {ajax, cardCache, toast} from 'nc-lightapp-front'; import addBtnClick from '../btnClicks/addBtnClick'; import delBtnClick from '../btnClicks/delBtnClick'; import editBtnClick from '../btnClicks/editBtnClick'; @@ -34,7 +34,7 @@ import unCommitBtnClick from '../btnClicks/unCommitBtnClick'; //收回 import linkBtnClick from '../btnClicks/linkBtnClick'; //单据追溯 import printBtnClick from '../btnClicks/printBtnClick'; //打印 import outputBtnClick from '../btnClicks/outputBtnClick'; //输出 -import pageInfoClick from '../btnClicks/pageInfoClick'; +import pageInfoClick, {commonShow, setBtnShow} from '../btnClicks/pageInfoClick'; import printbarCodeBtnClick from '../btnClicks/printbarCodeBtnClick'; //打印条码 import barCodePrintBtnClick from '../btnClicks/barCodePrintBtnClick'; //直接打印条码 import cancelTransferBtnClick from '../btnClicks/cancelTransferBtnClick'; //退出转单 @@ -52,608 +52,598 @@ import batchEditSave from '../btnClicks/batchEditSave'; import batchEditServ from '../../pub/batchedit/service/batchEditServ'; import exportTemClick from '../btnClicks/exportTemClick'; //导出 import importClick from '../btnClicks/importClick'; //导入 -import toPlm from '../btnClicks/toPlm'; //传递设计任务 -import { - PMO_LIST, - PMO_CARD, - PMO_LIST_BUTTON, - PMO_CARD_BUTTON, - FBILLSTATUS, - BODYFBILLSTATUS, - HEADATTRCODE, - BODYATTRCODE, - GRANDATTRCODE -} from '../../pmoconst'; -import { RownoUtils } from '../../../../../mmpub/mmpub/pub/tool/cardTableTools'; -import { rowCopyPasteUtils } from '../../../../../mmpub/mmpub/pub/tool/cardTableTools/rowCopyPasteUtils'; -import { buttonController } from './index'; -import { setBtnShow, commonShow } from '../btnClicks/pageInfoClick'; -import { showWarningDialog, showSuccessInfo, showErrorInfo } from '../../../../../mmpub/mmpub/pub/tool/messageUtil.js'; -import { getLangByResId } from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; -const { updateCache } = cardCache; +import {BODYATTRCODE, FBILLSTATUS, HEADATTRCODE, PMO_CARD, PMO_CARD_BUTTON, PMO_LIST} from '../../pmoconst'; +import {RownoUtils} from '../../../../../mmpub/mmpub/pub/tool/cardTableTools'; +import {rowCopyPasteUtils} from '../../../../../mmpub/mmpub/pub/tool/cardTableTools/rowCopyPasteUtils'; +import {buttonController} from './index'; +import {showErrorInfo, showSuccessInfo, showWarningDialog} from '../../../../../mmpub/mmpub/pub/tool/messageUtil.js'; +import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import toPlm from "../btnClicks/toPlm";// 传递设计任务 + +const {updateCache} = cardCache; let tableId = PMO_CARD.tableId; let formId = PMO_CARD.formId; let dataSource = PMO_LIST.dataSource; export default function clickBtn(props, id, text, record, index) { - let _this = this; - let rows = []; - let rowIds = []; - //推单 - let channelType = props.getUrlParam(PMO_CARD.channelType); - let status = props.getUrlParam(PMO_CARD.status); - //拉单 - let transfer = props.getUrlParam(PMO_CARD.type); - switch (id) { - //刷新 - case PMO_CARD_BUTTON.refresh: - if (channelType || transfer) { - let data = { keyword: this.state.billId, pageid: this.pageId }; - ajax({ - url: PMO_CARD.queryCardURL, - data: data, - success: (res) => { - if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { - props.dealFormulamsg(res.formulamsg); - } - if (data === undefined) { - //订单编号 - this.setState({ - vbillcode: '', - billId: '' - }); - return; - } - if (res.data) { - //渲染数据前先清空值， - if (res.data.head) { - this.props.form.setAllFormValue({ - [formId]: res.data.head[formId] - }); - //卡片刷新后需要清空孙表缓存数据 - _this.setState({ - cleargrandcache: true, - grandloadflag: false, - snloadflag: false, - grandtabdatas: [], - allsnvos: [], - lineShowType: [], - vbillcode: res.data.head[formId].rows[0].values[HEADATTRCODE.VBILLCODE].value, - billId: res.data.head[formId].rows[0].values[HEADATTRCODE.CPMOHID].value, - billtype: res.data.head[formId].rows[0].values[HEADATTRCODE.VTRANTYPECODE].value - }); - } - if (res.data.body) { - this.props.cardTable.setTableData(tableId, res.data.body[tableId], null, true, true); - } - let fbillstatus = res.data.head[formId].rows[0].values[HEADATTRCODE.FBILLSTATUS].value; + let _this = this; + let rows = []; + let rowIds = []; + //推单 + let channelType = props.getUrlParam(PMO_CARD.channelType); + let status = props.getUrlParam(PMO_CARD.status); + //拉单 + let transfer = props.getUrlParam(PMO_CARD.type); + switch (id) { + //刷新 + case PMO_CARD_BUTTON.refresh: + if (channelType || transfer) { + let data = {keyword: this.state.billId, pageid: this.pageId}; + ajax({ + url: PMO_CARD.queryCardURL, + data: data, + success: (res) => { + if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { + props.dealFormulamsg(res.formulamsg); + } + if (data === undefined) { + //订单编号 + this.setState({ + vbillcode: '', + billId: '' + }); + return; + } + if (res.data) { + //渲染数据前先清空值， + if (res.data.head) { + this.props.form.setAllFormValue({ + [formId]: res.data.head[formId] + }); + //卡片刷新后需要清空孙表缓存数据 + _this.setState({ + cleargrandcache: true, + grandloadflag: false, + snloadflag: false, + grandtabdatas: [], + allsnvos: [], + lineShowType: [], + vbillcode: res.data.head[formId].rows[0].values[HEADATTRCODE.VBILLCODE].value, + billId: res.data.head[formId].rows[0].values[HEADATTRCODE.CPMOHID].value, + billtype: res.data.head[formId].rows[0].values[HEADATTRCODE.VTRANTYPECODE].value + }); + } + if (res.data.body) { + this.props.cardTable.setTableData(tableId, res.data.body[tableId], null, true, true); + } + let fbillstatus = res.data.head[formId].rows[0].values[HEADATTRCODE.FBILLSTATUS].value; - buttonController.setCardButtonVisiable.call(this, this.props, status, null); - setBtnShow(_this, fbillstatus); - buttonController.setBackButtonVisiable.call(this, this.props, null); - buttonController.lineSelected.call(this); + buttonController.setCardButtonVisiable.call(this, this.props, status, null); + setBtnShow(_this, fbillstatus); + buttonController.setBackButtonVisiable.call(this, this.props, null); + buttonController.lineSelected.call(this); - let pkid = res.data.head[formId].rows[0].values[HEADATTRCODE.CPMOHID].value; - updateCache(HEADATTRCODE.CPMOHID, pkid, res.data, formId, dataSource); - buttonController.setUIState.call(this, this.props, PMO_CARD.browse); - showSuccessInfo(getLangByResId(this, '50080000-000016')); /* 国际化处理： 刷新成功！*/ - } else { - showErrorInfo(getLangByResId(this, '50080000-000037')); /* 国际化处理： 刷新失败！*/ - } - }, - error: (res) => { - toast({ content: res.message, color: 'error' }); - commonShow.call(this, pk); - } - }); - } else { - let refresh = true; - pageInfoClick.bind(this, props, null, refresh)(); - } - return; - // 保存 - case PMO_CARD_BUTTON.save: - //cancelCommon.call(this, this.props); - let save = saveBtnClick.bind(this); - return save(props); - // 保存新增 - case PMO_CARD_BUTTON.saveadd: - //cancelCommon.call(this, this.props); - saveBtnClick.call(this, this.props, true); - break; - // 保存提交 - case PMO_CARD_BUTTON.savecommit: - //cancelCommon.call(this, this.props); - let savecommit = saveCommitBtnClick.bind(this); - return savecommit(props); - // 提交 - case PMO_CARD_BUTTON.commit: - let commit = commitBtnClick.bind(this); - return commit(props); - //打印 - case PMO_CARD_BUTTON.print: - let print = printBtnClick.bind(this); - return print(props); - //打印联副产品 - case PMO_CARD_BUTTON.printplanout: - let print4output = printBtnClick.bind(this); - return print4output(props, PMO_LIST.nodekey4planoutput); - //打印工序计划 - case PMO_CARD_BUTTON.printprocedure: - let print4procedure = printBtnClick.bind(this); - return print4procedure(props, PMO_LIST.nodekey4procedure); - //输出 - case PMO_CARD_BUTTON.output: - let output = outputBtnClick.bind(this, props); - return output(props); - //打印条形码 - case PMO_CARD_BUTTON.pmobcprint: - let bcparam = { billtype: PMO_LIST.billType, headarea: formId, bodyarea: tableId }; - printbarCodeBtnClick.call(this, props, bcparam); - break; - //直接打印条形码 - case PMO_CARD_BUTTON.pmobcdirectprint: - let params = { - billtype: PMO_LIST.billType, - oids: [ props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value ] - }; - barCodePrintBtnClick.call(this, props, params); - break; - // 收回 - case PMO_CARD_BUTTON.uncommit: - let uncommit = unCommitBtnClick.bind(this); - return uncommit(props); - // 取消 - case PMO_CARD_BUTTON.cancel: - //cancelCommon.call(this, this.props); - let cancel = cancelBtnClick.bind(this); - return cancel(props); - // 新增行 - case PMO_CARD_BUTTON.addline: - let bodyRowUtil = bodyRowUtils.bind(this); - return bodyRowUtil(props, index); - // 删除行 record有值走行删除逻辑，没有值走批量处理逻辑 - case PMO_CARD_BUTTON.deleteline: - if (record) { - props.cardTable.delRowsByIndex(tableId, index); - props.cardTable.saveChangedRowsOldValue(tableId, index, BODYATTRCODE.CMATERIALVID, null); - } else { - rows = this.props.cardTable.getCheckedRows(tableId); - rowIds = []; - rows.map((item) => { - rowIds.push(item.index); - }); - this.props.cardTable.delRowsByIndex(tableId, rowIds, false); - rows.map((index) => { - props.cardTable.saveChangedRowsOldValue(tableId, index, BODYATTRCODE.CMATERIALVID, null); - }); - } - buttonController.lineSelected.call(this); - buttonController.lineChanged.call(this, this.props); - break; - // 肩上-复制行 - case PMO_CARD_BUTTON.copyline: - rowCopyPasteUtils.copyRows.call( - _this, - props, - tableId, - PMO_CARD_BUTTON.cardBodyInit, - PMO_CARD_BUTTON.cardBodyCopy - ); - //RownoUtils.resetRowNo(props, tableId, BODYATTRCODE.VROWNO); - break; + let pkid = res.data.head[formId].rows[0].values[HEADATTRCODE.CPMOHID].value; + updateCache(HEADATTRCODE.CPMOHID, pkid, res.data, formId, dataSource); + buttonController.setUIState.call(this, this.props, PMO_CARD.browse); + showSuccessInfo(getLangByResId(this, '50080000-000016')); /* 国际化处理： 刷新成功！*/ + } else { + showErrorInfo(getLangByResId(this, '50080000-000037')); /* 国际化处理： 刷新失败！*/ + } + }, + error: (res) => { + toast({content: res.message, color: 'error'}); + commonShow.call(this, pk); + } + }); + } else { + let refresh = true; + pageInfoClick.bind(this, props, null, refresh)(); + } + return; + // 保存 + case PMO_CARD_BUTTON.save: + //cancelCommon.call(this, this.props); + let save = saveBtnClick.bind(this); + return save(props); + // 保存新增 + case PMO_CARD_BUTTON.saveadd: + //cancelCommon.call(this, this.props); + saveBtnClick.call(this, this.props, true); + break; + // 保存提交 + case PMO_CARD_BUTTON.savecommit: + //cancelCommon.call(this, this.props); + let savecommit = saveCommitBtnClick.bind(this); + return savecommit(props); + // 提交 + case PMO_CARD_BUTTON.commit: + let commit = commitBtnClick.bind(this); + return commit(props); + //打印 + case PMO_CARD_BUTTON.print: + let print = printBtnClick.bind(this); + return print(props); + //打印联副产品 + case PMO_CARD_BUTTON.printplanout: + let print4output = printBtnClick.bind(this); + return print4output(props, PMO_LIST.nodekey4planoutput); + //打印工序计划 + case PMO_CARD_BUTTON.printprocedure: + let print4procedure = printBtnClick.bind(this); + return print4procedure(props, PMO_LIST.nodekey4procedure); + //输出 + case PMO_CARD_BUTTON.output: + let output = outputBtnClick.bind(this, props); + return output(props); + //打印条形码 + case PMO_CARD_BUTTON.pmobcprint: + let bcparam = {billtype: PMO_LIST.billType, headarea: formId, bodyarea: tableId}; + printbarCodeBtnClick.call(this, props, bcparam); + break; + //直接打印条形码 + case PMO_CARD_BUTTON.pmobcdirectprint: + let params = { + billtype: PMO_LIST.billType, + oids: [props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value] + }; + barCodePrintBtnClick.call(this, props, params); + break; + // 收回 + case PMO_CARD_BUTTON.uncommit: + let uncommit = unCommitBtnClick.bind(this); + return uncommit(props); + // 取消 + case PMO_CARD_BUTTON.cancel: + //cancelCommon.call(this, this.props); + let cancel = cancelBtnClick.bind(this); + return cancel(props); + // 新增行 + case PMO_CARD_BUTTON.addline: + let bodyRowUtil = bodyRowUtils.bind(this); + return bodyRowUtil(props, index); + // 删除行 record有值走行删除逻辑，没有值走批量处理逻辑 + case PMO_CARD_BUTTON.deleteline: + if (record) { + props.cardTable.delRowsByIndex(tableId, index); + props.cardTable.saveChangedRowsOldValue(tableId, index, BODYATTRCODE.CMATERIALVID, null); + } else { + rows = this.props.cardTable.getCheckedRows(tableId); + rowIds = []; + rows.map((item) => { + rowIds.push(item.index); + }); + this.props.cardTable.delRowsByIndex(tableId, rowIds, false); + rows.map((index) => { + props.cardTable.saveChangedRowsOldValue(tableId, index, BODYATTRCODE.CMATERIALVID, null); + }); + } + buttonController.lineSelected.call(this); + buttonController.lineChanged.call(this, this.props); + break; + // 肩上-复制行 + case PMO_CARD_BUTTON.copyline: + rowCopyPasteUtils.copyRows.call( + _this, + props, + tableId, + PMO_CARD_BUTTON.cardBodyInit, + PMO_CARD_BUTTON.cardBodyCopy + ); + //RownoUtils.resetRowNo(props, tableId, BODYATTRCODE.VROWNO); + break; - // 肩上- 复制取消 - case PMO_CARD_BUTTON.pastecancel: - cancelCommon.call(this, this.props); - buttonController.lineSelected.call(this); - break; - case PMO_CARD_BUTTON.pastelast: // 粘贴至末行 - // 效率优化开启 - _this.props.beforeUpdatePage(); - rowCopyPasteUtils.pasteRowsToTail.call( - _this, - props, - tableId, - PMO_CARD_BUTTON.cardBodyInit, - PMO_CARD_BUTTON.cardBodyCopy, - [ - BODYATTRCODE.VROWNO, - BODYATTRCODE.VFREE1, - BODYATTRCODE.VFREE2, - BODYATTRCODE.VFREE3, - BODYATTRCODE.VFREE4, - BODYATTRCODE.VFREE5, - BODYATTRCODE.VFREE6, - BODYATTRCODE.VFREE7, - BODYATTRCODE.VFREE8, - BODYATTRCODE.VFREE9, - BODYATTRCODE.VFREE10 - ] - ); - RownoUtils.setRowNo(props, tableId, BODYATTRCODE.VROWNO); - buttonController.lineSelected.call(this); - // 效率优化开关关闭 - _this.props.updatePage(formId, tableId); - break; - case PMO_CARD_BUTTON.pastethis: // 粘贴至此 - rowCopyPasteUtils.pasteRowsToIndex.call( - _this, - props, - tableId, - index, - PMO_CARD_BUTTON.cardBodyInit, - PMO_CARD_BUTTON.cardBodyCopy, - [ - BODYATTRCODE.CMOID, - BODYATTRCODE.VROWNO, - BODYATTRCODE.VFREE1, - BODYATTRCODE.VFREE2, - BODYATTRCODE.VFREE3, - BODYATTRCODE.VFREE4, - BODYATTRCODE.VFREE5, - BODYATTRCODE.VFREE6, - BODYATTRCODE.VFREE7, - BODYATTRCODE.VFREE8, - BODYATTRCODE.VFREE9, - BODYATTRCODE.VFREE10 - ] - ); - RownoUtils.setRowNo(props, tableId, BODYATTRCODE.VROWNO); - buttonController.lineSelected.call(this); - break; + // 肩上- 复制取消 + case PMO_CARD_BUTTON.pastecancel: + cancelCommon.call(this, this.props); + buttonController.lineSelected.call(this); + break; + case PMO_CARD_BUTTON.pastelast: // 粘贴至末行 + // 效率优化开启 + _this.props.beforeUpdatePage(); + rowCopyPasteUtils.pasteRowsToTail.call( + _this, + props, + tableId, + PMO_CARD_BUTTON.cardBodyInit, + PMO_CARD_BUTTON.cardBodyCopy, + [ + BODYATTRCODE.VROWNO, + BODYATTRCODE.VFREE1, + BODYATTRCODE.VFREE2, + BODYATTRCODE.VFREE3, + BODYATTRCODE.VFREE4, + BODYATTRCODE.VFREE5, + BODYATTRCODE.VFREE6, + BODYATTRCODE.VFREE7, + BODYATTRCODE.VFREE8, + BODYATTRCODE.VFREE9, + BODYATTRCODE.VFREE10 + ] + ); + RownoUtils.setRowNo(props, tableId, BODYATTRCODE.VROWNO); + buttonController.lineSelected.call(this); + // 效率优化开关关闭 + _this.props.updatePage(formId, tableId); + break; + case PMO_CARD_BUTTON.pastethis: // 粘贴至此 + rowCopyPasteUtils.pasteRowsToIndex.call( + _this, + props, + tableId, + index, + PMO_CARD_BUTTON.cardBodyInit, + PMO_CARD_BUTTON.cardBodyCopy, + [ + BODYATTRCODE.CMOID, + BODYATTRCODE.VROWNO, + BODYATTRCODE.VFREE1, + BODYATTRCODE.VFREE2, + BODYATTRCODE.VFREE3, + BODYATTRCODE.VFREE4, + BODYATTRCODE.VFREE5, + BODYATTRCODE.VFREE6, + BODYATTRCODE.VFREE7, + BODYATTRCODE.VFREE8, + BODYATTRCODE.VFREE9, + BODYATTRCODE.VFREE10 + ] + ); + RownoUtils.setRowNo(props, tableId, BODYATTRCODE.VROWNO); + buttonController.lineSelected.call(this); + break; - case PMO_CARD_BUTTON.insertline: //插入行 - let insertline = bodyRowUtils.bind(this); - return insertline(props, index, true); - //批改 - case PMO_CARD_BUTTON.batchedit: - //最好校验下状态 - let fbillstatus = this.props.form.getFormItemsValue(formId, HEADATTRCODE.FBILLSTATUS).value; - if (fbillstatus != FBILLSTATUS.free) { - showWarningDialog( - getLangByResId(this, '50080000-000017'), - getLangByResId(this, '50080000-000062') - ); /* 国际化处理： 提示,只有自由态流程生产订单才可以批改!*/ - return; - } - let pk_group = this.props.form.getFormItemsValue(formId, HEADATTRCODE.PK_GROUP).value; - let pk_org = this.props.form.getFormItemsValue(formId, HEADATTRCODE.PK_ORG).value; - batchEditServ.call( - this, - this.props, - { - [HEADATTRCODE.PK_GROUP]: pk_group, - [HEADATTRCODE.PK_ORG]: pk_org - }, - batchEditSave - ); - break; - //重排行号 - case PMO_CARD_BUTTON.resetno: - let rowB = rowBtnClick.bind(this); - return rowB(props, tableId, BODYATTRCODE.VROWNO); - // 新增 - case PMO_CARD_BUTTON.add: - let add = addBtnClick.bind(this); - return add(props); - // 复制单据 - case PMO_CARD_BUTTON.copy: - let copy = copyBtnClick.bind(this); - return copy(props); - // 修改 - case PMO_CARD_BUTTON.edit: - let edit = editBtnClick.bind(this); - return edit(props, false); - //变更 - case PMO_CARD_BUTTON.pmoadjust: - let adjust = adjustBtnClick.bind(this); - return adjust(props); - // 删除 - case PMO_CARD_BUTTON.delete: - let del = delBtnClick.bind(this); - return del(props); - //展开 - case PMO_CARD_BUTTON.openrow: - if (channelType || transfer) { - status = this.state.status; - } - if (status == PMO_CARD.browse) { - //浏览态 - props.cardTable.toggleRowView(tableId, record); - // this.state.lineShowType = []; - this.state.lineShowType[index] = 1; - this.setState({ - lineShowType: this.state.lineShowType - }); - } else { - //编辑态 - props.cardTable.openModel(tableId, PMO_CARD.edit, record, index); - } - break; - //收起 - case PMO_CARD_BUTTON.closerow: - if (channelType || transfer) { - status = this.state.status; - } - if (status == PMO_CARD.browse) { - //浏览态 - props.cardTable.toggleRowView(tableId, record); - //this.state.lineShowType = []; - this.state.lineShowType[index] = 0; - this.setState({ - lineShowType: this.state.lineShowType - }); - } else { - //编辑态 - props.cardTable.openModel(tableId, PMO_CARD.edit, record, index); - } - break; - case PMO_CARD_BUTTON.put: - let put = putBtnClick.bind(this, this.props, false); - return put(props); - case PMO_CARD_BUTTON.rowput: - if (record) { - let irowput = putBtnClick.bind(this); - return irowput(props, true, record); - } else { - let rowput = putBtnClick.bind(this); - return rowput(props, true); - } - case PMO_CARD_BUTTON.unput: - let unput = unputBtnClick.bind(this); - return unput(props, false); - case PMO_CARD_BUTTON.rowunput: - if (record) { - let irowunput = unputBtnClick.bind(this); - return irowunput(props, true, record); - } else { - let rowunput = unputBtnClick.bind(this); - return rowunput(props, true); - } - case PMO_CARD_BUTTON.rowfinish: - if (record) { - let irowfinish = finishBtnClick.bind(this); - return irowfinish(props, true, record); - } else { - let rowfinish = finishBtnClick.bind(this); - return rowfinish(props, true); - } + case PMO_CARD_BUTTON.insertline: //插入行 + let insertline = bodyRowUtils.bind(this); + return insertline(props, index, true); + //批改 + case PMO_CARD_BUTTON.batchedit: + //最好校验下状态 + let fbillstatus = this.props.form.getFormItemsValue(formId, HEADATTRCODE.FBILLSTATUS).value; + if (fbillstatus != FBILLSTATUS.free) { + showWarningDialog( + getLangByResId(this, '50080000-000017'), + getLangByResId(this, '50080000-000062') + ); /* 国际化处理： 提示,只有自由态流程生产订单才可以批改!*/ + return; + } + let pk_group = this.props.form.getFormItemsValue(formId, HEADATTRCODE.PK_GROUP).value; + let pk_org = this.props.form.getFormItemsValue(formId, HEADATTRCODE.PK_ORG).value; + batchEditServ.call( + this, + this.props, + { + [HEADATTRCODE.PK_GROUP]: pk_group, + [HEADATTRCODE.PK_ORG]: pk_org + }, + batchEditSave + ); + break; + //重排行号 + case PMO_CARD_BUTTON.resetno: + let rowB = rowBtnClick.bind(this); + return rowB(props, tableId, BODYATTRCODE.VROWNO); + // 新增 + case PMO_CARD_BUTTON.add: + let add = addBtnClick.bind(this); + return add(props); + // 复制单据 + case PMO_CARD_BUTTON.copy: + let copy = copyBtnClick.bind(this); + return copy(props); + // 修改 + case PMO_CARD_BUTTON.edit: + let edit = editBtnClick.bind(this); + return edit(props, false); + //变更 + case PMO_CARD_BUTTON.pmoadjust: + let adjust = adjustBtnClick.bind(this); + return adjust(props); + // 删除 + case PMO_CARD_BUTTON.delete: + let del = delBtnClick.bind(this); + return del(props); + //展开 + case PMO_CARD_BUTTON.openrow: + if (channelType || transfer) { + status = this.state.status; + } + if (status == PMO_CARD.browse) { + //浏览态 + props.cardTable.toggleRowView(tableId, record); + // this.state.lineShowType = []; + this.state.lineShowType[index] = 1; + this.setState({ + lineShowType: this.state.lineShowType + }); + } else { + //编辑态 + props.cardTable.openModel(tableId, PMO_CARD.edit, record, index); + } + break; + //收起 + case PMO_CARD_BUTTON.closerow: + if (channelType || transfer) { + status = this.state.status; + } + if (status == PMO_CARD.browse) { + //浏览态 + props.cardTable.toggleRowView(tableId, record); + //this.state.lineShowType = []; + this.state.lineShowType[index] = 0; + this.setState({ + lineShowType: this.state.lineShowType + }); + } else { + //编辑态 + props.cardTable.openModel(tableId, PMO_CARD.edit, record, index); + } + break; + case PMO_CARD_BUTTON.put: + let put = putBtnClick.bind(this, this.props, false); + return put(props); + case PMO_CARD_BUTTON.rowput: + if (record) { + let irowput = putBtnClick.bind(this); + return irowput(props, true, record); + } else { + let rowput = putBtnClick.bind(this); + return rowput(props, true); + } + case PMO_CARD_BUTTON.unput: + let unput = unputBtnClick.bind(this); + return unput(props, false); + case PMO_CARD_BUTTON.rowunput: + if (record) { + let irowunput = unputBtnClick.bind(this); + return irowunput(props, true, record); + } else { + let rowunput = unputBtnClick.bind(this); + return rowunput(props, true); + } + case PMO_CARD_BUTTON.rowfinish: + if (record) { + let irowfinish = finishBtnClick.bind(this); + return irowfinish(props, true, record); + } else { + let rowfinish = finishBtnClick.bind(this); + return rowfinish(props, true); + } - case PMO_CARD_BUTTON.finish: - let finish = finishBtnClick.bind(this, this.props, false); - return finish(props); - case PMO_CARD_BUTTON.rowunfinish: - if (record) { - let irowfinishcancel = finishcancelBtnClick.bind(this); - return irowfinishcancel(props, true, record); - } else { - let rowfinishcancel = finishcancelBtnClick.bind(this); - return rowfinishcancel(props, true); - } + case PMO_CARD_BUTTON.finish: + let finish = finishBtnClick.bind(this, this.props, false); + return finish(props); + case PMO_CARD_BUTTON.rowunfinish: + if (record) { + let irowfinishcancel = finishcancelBtnClick.bind(this); + return irowfinishcancel(props, true, record); + } else { + let rowfinishcancel = finishcancelBtnClick.bind(this); + return rowfinishcancel(props, true); + } - case PMO_CARD_BUTTON.unfinish: - let finishcancel = finishcancelBtnClick.bind(this, this.props, false); - return finishcancel(props); - case PMO_CARD_BUTTON.rowclose: - if (record) { - let irowclose = closeBtnClick.bind(this); - return irowclose(props, true, record); - } else { - let rowclose = closeBtnClick.bind(this); - return rowclose(props, true); - } + case PMO_CARD_BUTTON.unfinish: + let finishcancel = finishcancelBtnClick.bind(this, this.props, false); + return finishcancel(props); + case PMO_CARD_BUTTON.rowclose: + if (record) { + let irowclose = closeBtnClick.bind(this); + return irowclose(props, true, record); + } else { + let rowclose = closeBtnClick.bind(this); + return rowclose(props, true); + } - case PMO_CARD_BUTTON.close: - let close = closeBtnClick.bind(this, this.props, false); - return close(props); - case PMO_CARD_BUTTON.rowunclose: - if (record) { - let irowclosecancel = closecancelBtnClick.bind(this); - return irowclosecancel(props, true, record); - } else { - let rowclosecancel = closecancelBtnClick.bind(this); - return rowclosecancel(props, true); - } - case PMO_CARD_BUTTON.unclose: - let closecancel = closecancelBtnClick.bind(this, this.props, false); - return closecancel(props); - case PMO_CARD_BUTTON.rowautoclose: - if (record) { - let irowautoclose = autocloseBtnClick.bind(this); - return irowautoclose(props, true, record); - } else { - let rowautoclose = autocloseBtnClick.bind(this); - return rowautoclose(props, true); - } - case PMO_CARD_BUTTON.autoclose: - let autoclose = autocloseBtnClick.bind(this, this.props, false); - return autoclose(props); - //单据追溯 - case PMO_CARD_BUTTON.trace: - let linkQuery = linkBtnClick.bind(this); - return linkQuery(props); - //备料计划 - case PMO_CARD_BUTTON.pmopickm: - if (record) { - let rowpickm = pickmBtnClick.bind(this); - return rowpickm(props, record); - } else { - let pickm = pickmBtnClick.bind(this); - return pickm(props); - } - //工序委外计划 - case PMO_CARD_BUTTON.pmopscplan: - let pscplan = pscplanBtnClick.bind(this); - return pscplan(props); - //查看变更历史 - case PMO_CARD_BUTTON.pmoviewver: - let viewver = viewverBtnClick.bind(this); - return viewver(props); - //附件管理 - case PMO_CARD_BUTTON.file: - let flag = this.state.showUploader; - this.setState({ - showUploader: !flag - // target: event.target - }); - break; - //审批详情 - case PMO_CARD_BUTTON.ApproveInfo: - let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value; - let billtype = props.form.getFormItemsValue(formId, HEADATTRCODE.VTRANTYPECODE).value; - this.setState({ - show: true, - billtype: billtype, - billId: billId - }); - break; - //投放计划 - case PMO_CARD_BUTTON.pmotoputplan: - let pmotoputplan = pmoToPutPlanBtnClick.bind(this); - return pmotoputplan(props); - //配套变更建议 - case PMO_CARD_BUTTON.pmoMos: - let pmomos = pmoMosBtnClick.bind(this); - return pmomos(props); - //分次投放 - case PMO_CARD_BUTTON.pmoresolve: - let pmoresolve = pmoresolveBtnClick.bind(this); - return pmoresolve(props); - //产能分流 - case PMO_CARD_BUTTON.pmoturn: - let pmoturn = pmoturnBtnClick.bind(this); - return pmoturn(props); - //备料重算 - case PMO_CARD_BUTTON.pmopickmrecalaction: - if (record) { - let rowpickmrecal = pickmrecalBtnClick.bind(this); - return rowpickmrecal(props, record); - } else { - let pickmrecal = pickmrecalBtnClick.bind(this); - return pickmrecal(props); - } - //报废补单 - case PMO_CARD_BUTTON.pmoscrapadd: - let scrapadd = pmoscrapaddBtnClick.bind(this); - return scrapadd(props); - //详细信息 - case PMO_CARD_BUTTON.showgranddetail: - if (record) { - let rowshowgrand = showGrandBtnClick.bind(this); - return rowshowgrand(props, record); - } else { - let showgrand = showGrandBtnClick.bind(this); - return showgrand(props); - } - //序列号 - case PMO_CARD_BUTTON.pmosn: - let pmosn = pmosnBtnClick.bind(this); - return pmosn(props); - case PMO_CARD_BUTTON.snaction: - if (record) { - let rowpmosnaction = pmosnBtnClick.bind(this); - return rowpmosnaction(props, record); - } else { - let pmosnaction = pmosnBtnClick.bind(this); - return pmosnaction(props); - } - case PMO_CARD_BUTTON.CancelTransfer: - let cancelTrans = cancelTransferBtnClick.bind(this); - return cancelTrans(props); - case PMO_CARD_BUTTON.pmoactivity: - let activity = pmoactivityBtnClick.bind(this); - return activity(props); - //齐套分析 - case PMO_CARD_BUTTON.pmoSetAnalysis: - let setanalysis = pmoSetAnalysisBtnClick.bind(this); - return setanalysis(this); - //生产领料 - case PMO_CARD_BUTTON.pmodeliver: - if (record) { - let rowdeliver = pmodeliverBtnClick.bind(this); - return rowdeliver(props, record); - } else { - let deliver = pmodeliverBtnClick.bind(this); - return deliver(props); - } - //成套领料 - case PMO_CARD_BUTTON.pmodeliverset: - if (record) { - let rowdeliverset = pmodeliversetBtnClick.bind(this); - return rowdeliverset(props, record); - } else { - let deliverset = pmodeliversetBtnClick.bind(this); - return deliverset(props); - } + case PMO_CARD_BUTTON.close: + let close = closeBtnClick.bind(this, this.props, false); + return close(props); + case PMO_CARD_BUTTON.rowunclose: + if (record) { + let irowclosecancel = closecancelBtnClick.bind(this); + return irowclosecancel(props, true, record); + } else { + let rowclosecancel = closecancelBtnClick.bind(this); + return rowclosecancel(props, true); + } + case PMO_CARD_BUTTON.unclose: + let closecancel = closecancelBtnClick.bind(this, this.props, false); + return closecancel(props); + case PMO_CARD_BUTTON.rowautoclose: + if (record) { + let irowautoclose = autocloseBtnClick.bind(this); + return irowautoclose(props, true, record); + } else { + let rowautoclose = autocloseBtnClick.bind(this); + return rowautoclose(props, true); + } + case PMO_CARD_BUTTON.autoclose: + let autoclose = autocloseBtnClick.bind(this, this.props, false); + return autoclose(props); + //单据追溯 + case PMO_CARD_BUTTON.trace: + let linkQuery = linkBtnClick.bind(this); + return linkQuery(props); + //备料计划 + case PMO_CARD_BUTTON.pmopickm: + if (record) { + let rowpickm = pickmBtnClick.bind(this); + return rowpickm(props, record); + } else { + let pickm = pickmBtnClick.bind(this); + return pickm(props); + } + //工序委外计划 + case PMO_CARD_BUTTON.pmopscplan: + let pscplan = pscplanBtnClick.bind(this); + return pscplan(props); + //查看变更历史 + case PMO_CARD_BUTTON.pmoviewver: + let viewver = viewverBtnClick.bind(this); + return viewver(props); + //附件管理 + case PMO_CARD_BUTTON.file: + let flag = this.state.showUploader; + this.setState({ + showUploader: !flag + // target: event.target + }); + break; + //审批详情 + case PMO_CARD_BUTTON.ApproveInfo: + let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value; + let billtype = props.form.getFormItemsValue(formId, HEADATTRCODE.VTRANTYPECODE).value; + this.setState({ + show: true, + billtype: billtype, + billId: billId + }); + break; + //投放计划 + case PMO_CARD_BUTTON.pmotoputplan: + let pmotoputplan = pmoToPutPlanBtnClick.bind(this); + return pmotoputplan(props); + //配套变更建议 + case PMO_CARD_BUTTON.pmoMos: + let pmomos = pmoMosBtnClick.bind(this); + return pmomos(props); + //分次投放 + case PMO_CARD_BUTTON.pmoresolve: + let pmoresolve = pmoresolveBtnClick.bind(this); + return pmoresolve(props); + //产能分流 + case PMO_CARD_BUTTON.pmoturn: + let pmoturn = pmoturnBtnClick.bind(this); + return pmoturn(props); + //备料重算 + case PMO_CARD_BUTTON.pmopickmrecalaction: + if (record) { + let rowpickmrecal = pickmrecalBtnClick.bind(this); + return rowpickmrecal(props, record); + } else { + let pickmrecal = pickmrecalBtnClick.bind(this); + return pickmrecal(props); + } + //报废补单 + case PMO_CARD_BUTTON.pmoscrapadd: + let scrapadd = pmoscrapaddBtnClick.bind(this); + return scrapadd(props); + //详细信息 + case PMO_CARD_BUTTON.showgranddetail: + if (record) { + let rowshowgrand = showGrandBtnClick.bind(this); + return rowshowgrand(props, record); + } else { + let showgrand = showGrandBtnClick.bind(this); + return showgrand(props); + } + //序列号 + case PMO_CARD_BUTTON.pmosn: + let pmosn = pmosnBtnClick.bind(this); + return pmosn(props); + case PMO_CARD_BUTTON.snaction: + if (record) { + let rowpmosnaction = pmosnBtnClick.bind(this); + return rowpmosnaction(props, record); + } else { + let pmosnaction = pmosnBtnClick.bind(this); + return pmosnaction(props); + } + case PMO_CARD_BUTTON.CancelTransfer: + let cancelTrans = cancelTransferBtnClick.bind(this); + return cancelTrans(props); + case PMO_CARD_BUTTON.pmoactivity: + let activity = pmoactivityBtnClick.bind(this); + return activity(props); + //齐套分析 + case PMO_CARD_BUTTON.pmoSetAnalysis: + let setanalysis = pmoSetAnalysisBtnClick.bind(this); + return setanalysis(this); + //生产领料 + case PMO_CARD_BUTTON.pmodeliver: + if (record) { + let rowdeliver = pmodeliverBtnClick.bind(this); + return rowdeliver(props, record); + } else { + let deliver = pmodeliverBtnClick.bind(this); + return deliver(props); + } + //成套领料 + case PMO_CARD_BUTTON.pmodeliverset: + if (record) { + let rowdeliverset = pmodeliversetBtnClick.bind(this); + return rowdeliverset(props, record); + } else { + let deliverset = pmodeliversetBtnClick.bind(this); + return deliverset(props); + } - //补成套领料 - case PMO_CARD_BUTTON.pmodeliverfillset: - if (record) { - let rowdeliverfillset = pmodeliverfillsetBtnClick.bind(this); - return rowdeliverfillset(props, record); - } else { - let deliverfillset = pmodeliverfillsetBtnClick.bind(this); - return deliverfillset(props); - } - //成套退料 - case PMO_CARD_BUTTON.pmodeliversetback: - if (record) { - let rowdeliversetback = pmodeliversetbackBtnClick.bind(this); - return rowdeliversetback(props, record); - } else { - let deliversetback = pmodeliversetbackBtnClick.bind(this); - return deliversetback(props); - } - //退料处理 - case PMO_CARD_BUTTON.pmodeliverback: - if (record) { - let rowdeliverback = pmodeliverbackBtnClick.bind(this); - return rowdeliverback(props, record); - } else { - let deliverback = pmodeliverbackBtnClick.bind(this); - return deliverback(props); - } - //无备料领料 - case PMO_CARD_BUTTON.pmounpickmdeliver: - if (record) { - let rowunpickmdeliver = pmounpickmdeliverBtnClick.bind(this); - return rowunpickmdeliver(props, record); - } else { - let unpickmdeliver = pmounpickmdeliverBtnClick.bind(this); - return unpickmdeliver(props); - } - case PMO_CARD_BUTTON.ExportTem: { - //导出 - let exportTem = exportTemClick.bind(this, props, id); - return exportTem(props); - } - case PMO_CARD_BUTTON.Import: { - //导入 - let importC = importClick.bind(this, props, id); - return importC(props); - } - case "pushToPlm":{ - // 传递设计任务 -//导入 - let toPlm = toPlm.bind(this, props, id); - return toPlm(props); - } - } + //补成套领料 + case PMO_CARD_BUTTON.pmodeliverfillset: + if (record) { + let rowdeliverfillset = pmodeliverfillsetBtnClick.bind(this); + return rowdeliverfillset(props, record); + } else { + let deliverfillset = pmodeliverfillsetBtnClick.bind(this); + return deliverfillset(props); + } + //成套退料 + case PMO_CARD_BUTTON.pmodeliversetback: + if (record) { + let rowdeliversetback = pmodeliversetbackBtnClick.bind(this); + return rowdeliversetback(props, record); + } else { + let deliversetback = pmodeliversetbackBtnClick.bind(this); + return deliversetback(props); + } + //退料处理 + case PMO_CARD_BUTTON.pmodeliverback: + if (record) { + let rowdeliverback = pmodeliverbackBtnClick.bind(this); + return rowdeliverback(props, record); + } else { + let deliverback = pmodeliverbackBtnClick.bind(this); + return deliverback(props); + } + //无备料领料 + case PMO_CARD_BUTTON.pmounpickmdeliver: + if (record) { + let rowunpickmdeliver = pmounpickmdeliverBtnClick.bind(this); + return rowunpickmdeliver(props, record); + } else { + let unpickmdeliver = pmounpickmdeliverBtnClick.bind(this); + return unpickmdeliver(props); + } + case PMO_CARD_BUTTON.ExportTem: { + //导出 + let exportTem = exportTemClick.bind(this, props, id); + return exportTem(props); + } + case PMO_CARD_BUTTON.Import: { + //导入 + let importC = importClick.bind(this, props, id); + return importC(props); + } + case PMO_CARD_BUTTON.PushToPlm: { + let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value; + // 传递设计任务 + let toPlm1 = toPlm.bind(this, props, billId); + return toPlm1(props); + } + } } function setPKempty(props, index) { - let empty = { - value: null, - display: null, - scale: '-1' - }; - props.cardTable.setValByKeyAndIndex(tableId, index, BODYATTRCODE.VROWNO, empty); + let empty = { + value: null, + display: null, + scale: '-1' + }; + props.cardTable.setValByKeyAndIndex(tableId, index, BODYATTRCODE.VROWNO, empty); } function cancelCommon(props, curTableId) { - if (curTableId == undefined || curTableId == tableId) { - rowCopyPasteUtils.cancel.call(this, props, tableId, PMO_CARD_BUTTON.cardBodyInit, PMO_CARD_BUTTON.cardBodyCopy); - } + if (curTableId == undefined || curTableId == tableId) { + rowCopyPasteUtils.cancel.call(this, props, tableId, PMO_CARD_BUTTON.cardBodyInit, PMO_CARD_BUTTON.cardBodyCopy); + } } /*h84Q5eMmSJsRENxS4eEsJjmOFeWEkNULYgCC66dfv5A=*/ \ No newline at end of file diff --git a/src/mmpac/mmpac/pmo/pmoconst/pmoconst.js b/src/mmpac/mmpac/pmo/pmoconst/pmoconst.js index 06fe1029..b525a7e4 100644 --- a/src/mmpac/mmpac/pmo/pmoconst/pmoconst.js +++ b/src/mmpac/mmpac/pmo/pmoconst/pmoconst.js @@ -307,7 +307,8 @@ const PMO_CARD_BUTTON = { grand_g1: 'grand_g1', oresetno: 'OResetno', //联副产品重新排号 Import: 'Import', //导入 - ExportTem: 'ExportTem' //导出 + ExportTem: 'ExportTem', //导出 + PushToPlm: 'pushToPlm' //导出 }; const PMO_CARD = { @@ -772,7 +773,8 @@ const URL = { checkdeliverback: '/nccloud/mmpac/pmo/checkdeliverback.do', //退料建议检验 checkGrandDataURL: '/nccloud/mmpac/pmo/checkGrandData.do', //检验孙表数据 checkEnableURL: '/nccloud/mmpac/pmo/checkEnable.do', //模块是否启用 - checkToPscPlanURL: '/nccloud/mmpac/pmo/checkToPscPlan.do' //工序委外计划校验 + checkToPscPlanURL: '/nccloud/mmpac/pmo/checkToPscPlan.do', //工序委外计划校验 + toPlmURL: '/nccloud/mmpac/pmo/PmoToPlm.do' //手动推PLM内配订单 //checkpmodeliveryset: '/nccloud/mmpac/pmo/pmodeliveryset.do', }; const DELIVERDLG = { From 0329219376da39bbc695627f4432d1622386c5a2 Mon Sep 17 00:00:00 2001 From: lihao Date: Sat, 13 Sep 2025 14:54:06 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/card/viewController/btnClickControllor.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index 93555181..a650121c 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -865,9 +865,6 @@ export default async function clickBtn(props, id, text, record, index) { data = { cpickmids: hids } - data = { - cpickmids: cpickmids - } ajax({ url: '/nccloud/mmpac/pickm/pom.do', data: data, From f901d97203f0dab6a04db579495c1bca01cf8225 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 15 Sep 2025 20:07:38 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js | 2 +- .../mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js index 6e17cc5e..7f3a908f 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js @@ -347,7 +347,7 @@ function buttonClick(props, id, text, record, index) { break case BOM_CARD_HEAD_BUTTON.Download_plm: //图纸下载 { - downloadPlmBtnClick.call(this, props, id) + downloadPlmBtnClick.call(this, props, id, 'SIPM1') } break diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js index b478740a..d6522ace 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js @@ -11,7 +11,7 @@ import {showErrorInfo} from "../../../public/tools/messageUtil"; let tableId = BOM_AREA.bom_card_b; -export default function downloadPlmBtnClick(props) { +export default function downloadPlmBtnClick(props, id, type) { // 获取选中行 let rows = this.props.cardTable.getCheckedRows(tableId); // console.log('rows = ', rows); @@ -25,7 +25,8 @@ export default function downloadPlmBtnClick(props) { }); let params = { sys_appcode: BOM_PAGECODE.bom_card, - materialCode: data + materialCode: data, + itemName: [type] } formDownload({ params, From 339a5076039e23aa8cd8be3eb4e9852f8f31c12e Mon Sep 17 00:00:00 2001 From: lihao Date: Mon, 15 Sep 2025 20:29:53 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js | 4 ++++ src/uapbd/mmbase/bom0202/constance/card_const.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js index 7f3a908f..e290b46c 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js @@ -348,6 +348,10 @@ function buttonClick(props, id, text, record, index) { case BOM_CARD_HEAD_BUTTON.Download_plm: //图纸下载 { downloadPlmBtnClick.call(this, props, id, 'SIPM1') + } + case BOM_CARD_HEAD_BUTTON.FDownload_plm: //文件下载 + { + downloadPlmBtnClick.call(this, props, id, 'SIPM2') } break diff --git a/src/uapbd/mmbase/bom0202/constance/card_const.js b/src/uapbd/mmbase/bom0202/constance/card_const.js index d7f96775..201ddce4 100644 --- a/src/uapbd/mmbase/bom0202/constance/card_const.js +++ b/src/uapbd/mmbase/bom0202/constance/card_const.js @@ -45,6 +45,8 @@ Import: 'Import', //导入 LinkRepls : 'LinkRepls', //联查替代方案 Download_plm: 'download_plm', //图纸下载 + + FDownload_plm: 'fdownload_plm', //文件下载 } /** From 334272994819d799ab59912cb22e411a22b399ba Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 15 Sep 2025 21:38:02 +0800 Subject: [PATCH 14/17] =?UTF-8?q?Revert=20"=E5=9B=BE=E7=BA=B8=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f901d97203f0dab6a04db579495c1bca01cf8225. --- src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js | 2 +- .../mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js index e290b46c..eba3934b 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js @@ -347,7 +347,7 @@ function buttonClick(props, id, text, record, index) { break case BOM_CARD_HEAD_BUTTON.Download_plm: //图纸下载 { - downloadPlmBtnClick.call(this, props, id, 'SIPM1') + downloadPlmBtnClick.call(this, props, id) } case BOM_CARD_HEAD_BUTTON.FDownload_plm: //文件下载 { diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js index d6522ace..b478740a 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js @@ -11,7 +11,7 @@ import {showErrorInfo} from "../../../public/tools/messageUtil"; let tableId = BOM_AREA.bom_card_b; -export default function downloadPlmBtnClick(props, id, type) { +export default function downloadPlmBtnClick(props) { // 获取选中行 let rows = this.props.cardTable.getCheckedRows(tableId); // console.log('rows = ', rows); @@ -25,8 +25,7 @@ export default function downloadPlmBtnClick(props, id, type) { }); let params = { sys_appcode: BOM_PAGECODE.bom_card, - materialCode: data, - itemName: [type] + materialCode: data } formDownload({ params, From d07df4570ffddf13dffe9ec81a1274b07ece4734 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 16 Sep 2025 18:28:58 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=80=9F=E6=96=99?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/btnClicks/detailqueryBtnClick.js | 100 ++++++++++++++++++ src/mmpac/mmpac/pickm/card/btnClicks/index.js | 3 +- src/mmpac/mmpac/pickm/card/index.js | 6 +- .../card/viewController/btnClickControllor.js | 28 ++++- src/mmpac/mmpac/pickm/constance/index.js | 2 +- src/mmpac/mmpac/pickm/list/index.js | 6 +- .../viewController/buttonClickController.js | 15 ++- 7 files changed, 147 insertions(+), 13 deletions(-) create mode 100644 src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js b/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js new file mode 100644 index 00000000..09a670fc --- /dev/null +++ b/src/mmpac/mmpac/pickm/card/btnClicks/detailqueryBtnClick.js @@ -0,0 +1,100 @@ +import {ajax, toast} from 'nc-lightapp-front'; +import {AREA, URL, DIALOGCODE, FIELD} from '../../constance'; +import {initLang, getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'; +import PickmCLQueryDlg from '../../pickmclquery/list'; +import {showErrorInfo} from '../../../../../mmpub/mmpub/pub/tool/messageUtil'; + +export default function detailqueryBtnClick(props, record) { + let _this = this; + let bids = []; + let hid; + let rows = this.props.cardTable.getCheckedRows(AREA.bodyTable); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows) { + return; + } + if (rows.length <= 0) { + hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + } else { + rows.map((item) => { + let cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; + bids.push(cpickm_bid); + }); + } + doQuery.call(this, props, hid, bids, rows); + +} + +function doQuery(props, hid, bids, rows) { + let appcode = props.getAppCode(); + + ajax({ + url: '/nccloud/mmpac/pickm/pickmItemsQuery.do', + data: { + cpickmid: hid, + cpickmbids: bids, + pageid: DIALOGCODE.CLQUERYDLG, + appcode: appcode + }, + success: res => { + let bids = res.data.data; + // console.log('bids = ', bids); + let rows1 = []; + rows.map((item) => { + let values = item.data.values; + // 借料数量 = 计划出库数量-累计出库数量-累计发货数量-累计委外数量，所有数值用getNumber处理null转0 + values.borrowedQty = { + value: getNumber(values.nplanoutastnum) - getNumber(values.naccoutastnum) - + getNumber(values.nshouldastnum) - getNumber(values.npscastnum) + }; + let def26 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid").value; + // let def27 = this.props.form.getFormItemsValue(AREA.formArea,"cmaterialvid.name").value; + let form = this.props.form.getAllFormValue(AREA.formArea); + // values.cmaterialvid = { + // value: def26 + // }; + values.cmaterialvid = form.rows[0].values["cmaterialvid"]; + values.cmaterialvidName = { + value: form.rows[0].values["cmaterialvid.name"].value + }; + if(undefined !=form.rows[0].values["cmaterialvid.def26"]){ + values.cmaterialvidDef26 = { + value: form.rows[0].values["cmaterialvid.def26"].value + }; + } + let rowItem = { + isOptimized: false, + status: '0', + values: values + }; + // 确保 bids 是数组类型 + if (!Array.isArray(bids)) { + bids = [bids]; + } + // 筛选出未生成的行 + // console.log('values.cpickm_bid = ', values.cpickm_bid.value); + // console.log('values.indexOf = ', bids.indexOf(values.cpickm_bid.value)); + if (values.cpickm_bid && values.cpickm_bid.value && (bids.indexOf(values.cpickm_bid.value) > -1) && values.borrowedQty.value>0) { + rows1.push(rowItem); + } + }); + let data = { + areacode: 'clquery', + rows: rows1 + }; + // console.log('rows = ', rows); + // console.log('data = ', data); + props.table.setAllTableData(AREA.borrowMaterialDialog, data); + props.modal.show(AREA.borrowMaterialDialog); + } + }); +} + +// 本地安全数值转换方法，null/undefined/空对象转0 +function getNumber(data) { + if (data && data.value != null) { + return +data.value; + } else { + return 0; + } +} diff --git a/src/mmpac/mmpac/pickm/card/btnClicks/index.js b/src/mmpac/mmpac/pickm/card/btnClicks/index.js index cf30b411..1d6bdff8 100644 --- a/src/mmpac/mmpac/pickm/card/btnClicks/index.js +++ b/src/mmpac/mmpac/pickm/card/btnClicks/index.js @@ -22,6 +22,7 @@ import clqueryBtnClick from './clqueryBtnClick';//存量查询 import replaceBtnClick from './replaceBtnClick'; import reserveBtnClick from './reserveBtnClick'; import reserveQueryBtnClick from './reserveQueryBtnClick'; +import detailqueryBtnClick from './detailqueryBtnClick'; import pushrzmsBtnClick from './pushrzmsBtnClick.js'; //推送锐制 import borrowBtnClick from './borrowBtnClick.js'; import borrowOkBtnClick from "./borrowOkBtnClick.js"; @@ -29,6 +30,6 @@ export { pageInfoClick, getParentURlParme, setBtnShow, backBtnClick, addBtnClick, delBtnClick, editBtnClick, cancelBtnClick, saveBtnClick, saveCommitBtnClick, copyBtnClick, commitBtnClick, unCommitBtnClick, printBtnClick, outputBtnClick, subItemsBtnClick, - finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick, + finishBtnClick, unfinishBtnClick, clqueryBtnClick, replaceBtnClick,reserveBtnClick,reserveQueryBtnClick,detailqueryBtnClick, pageInfoClickPage,pushrzmsBtnClick, borrowBtnClick, borrowOkBtnClick }; diff --git a/src/mmpac/mmpac/pickm/card/index.js b/src/mmpac/mmpac/pickm/card/index.js index de0fc0f6..50b19d6f 100644 --- a/src/mmpac/mmpac/pickm/card/index.js +++ b/src/mmpac/mmpac/pickm/card/index.js @@ -272,9 +272,9 @@ class PickmCard extends Component { {createModal('TakeOverDlg', {zIndex: "300"})} {createModal('SetBackDeliverDlg', {zIndex: "280"})} {createModal('ReplaceDlg', {zIndex: "300"})} - {createModal('BorrowDlg', {zIndex: "300"})} + {/*{createModal('BorrowDlg', {zIndex: "300"})}*/} - {/*{createModal(AREA.borrowMaterialDialog, { + {createModal(AREA.borrowMaterialDialog, { title: '借料入库明细', content: (
@@ -317,7 +317,7 @@ class PickmCard extends Component { this.props.modal.close(AREA.borrowMaterialDialog) }, userControl: true - })}*/} + })}
@@ -390,7 +390,7 @@ class PickmList extends Component { this.props.modal.close('NCTable_3c81fe87') }, userControl: true - })}*/} + })}
); } diff --git a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js index c1250b76..6ffc09c0 100644 --- a/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js +++ b/src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js @@ -512,7 +512,7 @@ export default function (props, key, text, record, index) { data = { pks: cpickmids } - let setProps = (val) => { + /*let setProps = (val) => { this.props = val; } ajax({ @@ -528,7 +528,7 @@ export default function (props, key, text, record, index) { setProps={setProps}/>, userControl: true, // leftBtnName: '', - // rightBtnName: getLangByResId(this, '5008Pickm-000013'),/* 国际化处理： 取消*/ + // rightBtnName: getLangByResId(this, '5008Pickm-000013'),/!* 国际化处理： 取消*!/ beSureBtnClick: borrowOkBtnClick.bind(this, props, true), cancelBtnClick: () => { props.modal.close(AREA.BORROW_DLG); @@ -536,6 +536,17 @@ export default function (props, key, text, record, index) { }); } } + });*/ + ajax({ + url: '/nccloud/mmpac/pickm/pickmByIdsQuery.do', + data: data, + success: (res) => { + if(res.success){ + props.table.setAllTableData("NCTable_3c81fe87", res.data.data);//[0].card_body.rows + props.modal.show("NCTable_3c81fe87"); + toast({ content: "查询成功", color: 'success' }); + } + } }); break; case "to_pmo"://流程生产订单 From 57f1caeef1766d5233ff32329a99b204c2b707c3 Mon Sep 17 00:00:00 2001 From: lihao Date: Tue, 16 Sep 2025 18:46:02 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E8=A1=8C=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/viewController/btnClickControllor.js | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js index 7060c962..0de3bcff 100644 --- a/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js +++ b/src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js @@ -855,12 +855,25 @@ export default async function clickBtn(props, id, text, record, index) { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { hids = []; + bids = []; cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + rows = this.props.cardTable.getCheckedRows(AREA.bodyTable); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows || rows.length <= 0) { + hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + } else { + rows.map((item) => { + var cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; + bids.push(cpickm_bid); + }); + + } if (cpickmid) { hids.push(cpickmid); } data = { - cpickmids: hids + cpickmids: hids, + cpickmbids:bids } ajax({ url:'/nccloud/mmpac/pickm/buyingreq.do', @@ -876,16 +889,30 @@ export default async function clickBtn(props, id, text, record, index) { break; case "to_pmo"://流程生产订单 + showWarningDialog("是否生成生产订单", "", { /* 国际化处理： 确认终止,是否确定将此合同终止*/ beSureBtnClick: () => { hids = []; + bids = []; cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + rows = this.props.cardTable.getCheckedRows(AREA.bodyTable); + // 如果没有选中行，则提示并返回，不进行任何操作 + if (!rows || rows.length <= 0) { + hid = this.props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value; + } else { + rows.map((item) => { + var cpickm_bid = props.cardTable.getValByKeyAndIndex(AREA.bodyTable, item.index, 'cpickm_bid').value; + bids.push(cpickm_bid); + }); + + } if (cpickmid) { hids.push(cpickmid); } data = { - cpickmids: hids + cpickmids: hids, + cpickmbids:bids } ajax({ url: '/nccloud/mmpac/pickm/pom.do', From 521a729106625d261944cbd4145290b8ce319a75 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 16 Sep 2025 19:36:19 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js | 4 ---- src/uapbd/mmbase/bom0202/constance/card_const.js | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js index eba3934b..6e17cc5e 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/buttonClick.js @@ -348,10 +348,6 @@ function buttonClick(props, id, text, record, index) { case BOM_CARD_HEAD_BUTTON.Download_plm: //图纸下载 { downloadPlmBtnClick.call(this, props, id) - } - case BOM_CARD_HEAD_BUTTON.FDownload_plm: //文件下载 - { - downloadPlmBtnClick.call(this, props, id, 'SIPM2') } break diff --git a/src/uapbd/mmbase/bom0202/constance/card_const.js b/src/uapbd/mmbase/bom0202/constance/card_const.js index 201ddce4..d7f96775 100644 --- a/src/uapbd/mmbase/bom0202/constance/card_const.js +++ b/src/uapbd/mmbase/bom0202/constance/card_const.js @@ -45,8 +45,6 @@ Import: 'Import', //导入 LinkRepls : 'LinkRepls', //联查替代方案 Download_plm: 'download_plm', //图纸下载 - - FDownload_plm: 'fdownload_plm', //文件下载 } /**