From d07df4570ffddf13dffe9ec81a1274b07ece4734 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 16 Sep 2025 18:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=80=9F=E6=96=99=E5=85=A5?= =?UTF-8?q?=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"://流程生产订单