From 1fabb2eaa71f34fd4f6f1a1cd1fa876fadac666a Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 17 Sep 2025 10:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/orderIssure/soIssueNotify.js | 4 +- .../modules/orderIssure/newSoIssueNotify.vue | 205 +- .../productionInboundRequest.vue | 2435 +++++++++++++++-- 3 files changed, 2272 insertions(+), 372 deletions(-) diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js index 33fceeb..81c8c07 100644 --- a/src/api/orderIssure/soIssueNotify.js +++ b/src/api/orderIssure/soIssueNotify.js @@ -43,4 +43,6 @@ export const updateNotifyConfirmStatus= data => createAPI(`/orderIssure/issureNo export const updateNotifyBatchConfirmStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyBatchConfirmStatus`,'post',data) export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNotify/getSiteAndBuByUserName`,'post',data) -export const getEamWorkShop = data => createAPI(`/orderIssure/issureNotify/getEamWorkShop`,'post',data) \ No newline at end of file +export const getEamWorkShop = data => createAPI(`/orderIssure/issureNotify/getEamWorkShop`,'post',data) + +export const getIFSShopOrderByOrderNo = data => createAPI(`/orderIssure/issureNotify/getIFSShopOrderByOrderNo`,'post',data) \ No newline at end of file diff --git a/src/views/modules/orderIssure/newSoIssueNotify.vue b/src/views/modules/orderIssure/newSoIssueNotify.vue index 1ed6e16..c93bc2a 100644 --- a/src/views/modules/orderIssure/newSoIssueNotify.vue +++ b/src/views/modules/orderIssure/newSoIssueNotify.vue @@ -200,8 +200,8 @@ - - + + - + 加工中心 @@ -223,7 +223,7 @@ - + @@ -246,7 +246,7 @@ - + - + @@ -271,7 +271,7 @@ - + @@ -280,11 +280,11 @@ --> - + @@ -311,20 +311,21 @@ - + - + + - 全数领料 + 全数领料 @@ -366,7 +367,7 @@ - + @@ -606,7 +607,9 @@ import { saveSOIssueNotifyOrderList, getSOSBOMForIssure, saveMaterialDetail, - deleteNotifySOS + deleteNotifySOS, + getIFSShopOrderByOrderNo, + searchNotifyMaterialList, } from '@/api/orderIssure/soIssueNotify.js' import Chooselist from '@/views/modules/common/Chooselist_eam' import walUploadExcel from './walmart_upload_excel.vue' @@ -678,22 +681,20 @@ export default { itemNo: '', notifyOrderData: { partNo: '', - orderno: '', - itemno: '', - seqno: '', + orderNo: '', + itemNo: '', + seqNo: '', partDesc: '', qtyrequired: '', - sResourceid: '', + sResourceID: '', issureQty: '', locationNo: '', needDate: '', }, seqNoData: { site: this.$store.state.user.site, - bu: '', - orderno: '', seqno: '', - sResourceid: '', + sResourceID: '', sWorkcenterno: '', operatorId: '', sShiftno: '', @@ -805,7 +806,7 @@ export default { functionId: 701001, serialNumber: '701001Table1ItemNo', tableId: '701001Table1', - tableName: '领料申请派工单子表', + tableName: '领料申请工单子表', columnProp: 'itemNo', headerAlign: 'center', align: 'right', @@ -841,11 +842,11 @@ export default { functionId: 701001, serialNumber: '701001Table1SOOrderNo', tableId: '701001Table1', - tableName: '领料申请派工单子表', - columnProp: 'sOOrderNo', + tableName: '领料申请工单子表', + columnProp: 'soorderNo', headerAlign: 'center', align: 'center', - columnLabel: '生产订单', + columnLabel: '生产订单号', columnHidden: false, columnImage: false, columnSortable: false, @@ -859,7 +860,7 @@ export default { functionId: 701001, serialNumber: '701001Table1OpsItemNo', tableId: '701001Table1', - tableName: '领料申请派工单子表', + tableName: '领料申请工单子表', columnProp: 'opsItemNo', headerAlign: 'center', align: 'right', @@ -877,7 +878,7 @@ export default { functionId: 701001, serialNumber: '701001Table1ItemDesc', tableId: '701001Table1', - tableName: '领料申请派工单子表', + tableName: '领料申请工单子表', columnProp: 'itemDesc', headerAlign: 'center', align: 'left', @@ -895,7 +896,7 @@ export default { functionId: 701001, serialNumber: '701001Table1LocationNo', tableId: '701001Table1', - tableName: '领料申请派工单子表', + tableName: '领料申请工单子表', columnProp: 'locationNo', headerAlign: 'center', align: 'left', @@ -1206,7 +1207,7 @@ export default { serialNumber: '701001Table3PartDesc', tableId: '701001Table3', tableName: '领料申请BOM子表', - columnProp: 'partDesc', + columnProp: 'componentPartDesc', headerAlign: 'center', align: 'left', columnLabel: '物料描述', @@ -1369,6 +1370,7 @@ export default { showAddNotifyTypeDialog: false, selectedNotifyType: 'production', selectedNotifyRemark:'', + chooseLoading: false, } }, @@ -1564,7 +1566,27 @@ export default { }) }, addNotify() { - this.showAddNotifyTypeDialog = true + //this.showAddNotifyTypeDialog = true + let inData = { + site: this.$store.state.user.site, + userName: this.$store.state.user.name, + } + createNotify(inData).then(({ data }) => { + if (data.code === 0) { + this.showAddNotifyTypeDialog = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {}, + }) + this.getUserNotifyNo() + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定', + }) + } + }) }, confirmAddNotify() { let outWorkOrderFlag = 'N' @@ -1599,6 +1621,7 @@ export default { }, chooseSOS(row) { if (this.dataList.length > 0) { + //这边是有个判断的，判断派工单号不能重复 let stop = false for (let i = 0; i < this.dataList.length; i++) { if (this.dataList[i].seqNo == row.seqno) { @@ -1612,19 +1635,34 @@ export default { return false } } - console.log("row",row); + let inData = { + site: '55', + orderNo: '3039496', + } + this.chooseLoading = true + getIFSShopOrderByOrderNo(inData).then(({ data }) => { + if (data.code === 0) { + console.log("data",data); + this.notifyOrderData.partNo = data.shopOrderVo[0].partNo + this.notifyOrderData.orderNo = data.shopOrderVo[0].orderNo + this.notifyOrderData.itemNo = data.shopOrderVo[0].itemNo + this.notifyOrderData.seqNo = data.shopOrderVo[0].seqNo + this.notifyOrderData.partDesc = data.shopOrderVo[0].partDesc + this.notifyOrderData.qtyRequired = data.shopOrderVo[0].lotSize + this.notifyOrderData.sResourceID = row.sResourceID + this.notifyOrderData.issureQty = '' + this.notifyOrderData.needDate = this.dayjs().format('YYYY-MM-DD HH:mm') + this.notifyOrderData.locationNo = row.sResourceID + this.saveSeqNoModalFlag = true + }else { + this.$meassage.error(data.msg) + return; + } + }).finally(() => { + this.chooseLoading = false + }) + - this.notifyOrderData.partNo = row.partNo - this.notifyOrderData.orderNo = row.orderNo - this.notifyOrderData.itemNo = row.itemNo - this.notifyOrderData.seqNo = row.seqNo - this.notifyOrderData.partDesc = row.partDesc - this.notifyOrderData.qtyRequired = row.qtyRequired - this.notifyOrderData.sResourceID = row.sResourceID - this.notifyOrderData.issureQty = '' - this.notifyOrderData.needDate = this.dayjs().format('YYYY-MM-DD HH:mm') - this.notifyOrderData.locationNo = row.sResourceID - this.saveSeqNoModalFlag = true }, saveSOS() { if ( @@ -1647,6 +1685,7 @@ export default { return false } let row = this.notifyOrderData + console.log("row",row); if (this.dataList.length > 0) { let stop = false for (let i = 0; i < this.dataList.length; i++) { @@ -1661,7 +1700,7 @@ export default { return false } } - this.$confirm('确定选择工单' + row.seqno + '?', '提示', { + this.$confirm('确定选择工单' + row.orderNo + '?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -1669,21 +1708,21 @@ export default { let inData = { site: this.$store.state.user.site, notifyNo: this.notifyNo, - fGPartNo: row.partNo, - sOOrderNo: row.orderno, - opsItemNo: row.itemno, - seqNo: row.seqno, + fgPartNo: row.partNo, + soorderNo: row.orderNo, + opsItemNo: row.itemNo, + seqNo: row.seqNo, locationNo: row.locationNo, needDate: row.needDate, issureQty: row.issureQty, } - + saveSOIssueNotifyOrderList(inData).then(({ data }) => { if (data.code === 0) { this.saveSeqNoModalFlag = false + row.itemNo = data.itemNo this.getNotifyNoDetail() this.enterSOS(row) - //this.itemNo = data.itemNo } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定', @@ -1702,14 +1741,28 @@ export default { let rows = { site: this.$store.state.user.site, notifyNo: this.notifyNo, - orderno: row.sOOrderNo, - seqno: row.seqNo, - partNo: row.fGPartNo, - itemno: row.opsItemNo, + orderNo: row.soorderNo, + seqNo: row.seqNo, + partNo: row.fgPartNo, + itemNo: row.itemNo, } - this.itemNo = row.itemNo + + //this.searchNotifyMaterialList(rows) this.enterSOS(rows) }, + searchNotifyMaterialList(row){ + this.bomLoadFlag = true + this.materialModalFlag = true + searchNotifyMaterialList(row).then(({ data }) => { + if (data.code === 0) { + this.sobomList = data.rows + this.bomLoadFlag = false + } + }).catch(()=>{ + this.bomLoadFlag = false + }) + }, + enterSOS(row) { console.log("row",row); @@ -1717,23 +1770,26 @@ export default { this.materialModalFlag = true this.sobomList = [] this.sobomData = { - orderno: row.orderno, - seqno: row.seqno, + orderNo: row.orderNo, + seqNo: row.seqNo, partNo: row.partNo, } this.bomLoadFlag = true let inData = { site: this.$store.state.user.site, notifyNo: this.notifyNo, - orderno: row.orderno, - seqno: row.seqno, + orderNo: row.orderNo, + seqNo: row.seqNo, partNo: row.partNo, - itemno: row.itemno, + itemNo: row.itemNo, } getSOSBOMForIssure(inData).then(({ data }) => { this.bomLoadFlag = false if (data.code === 0) { this.sobomList = data.rows + for (let i = 0; i < this.sobomList.length; i++) { + this.sobomList[i].itemNo = inData.itemNo + } } }) }, @@ -1772,6 +1828,8 @@ export default { ) { this.sobomList[i].applyQty = 0 } + this.sobomList[i].notifyNo = this.notifyNo + this.sobomList[i].site = this.$store.state.user.site } let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0) @@ -1923,11 +1981,11 @@ export default { }) return false } - checkPartStock(this.notifyData).then(({ data }) => { + /* checkPartStock(this.notifyData).then(({ data }) => { if (data.code === 0) { this.xiadaList = data.rows } - }) + }) */ this.xiadaModelFlag = true }, xiadaNotify() { @@ -2000,7 +2058,7 @@ export default { updateBuModel() { if (this.dataList.length > 0) { this.$alert( - '已经选择了派工单，无法切换BU，请删除已选派工单！', + '已经选择了工单，无法切换BU，请删除已选工单！', '错误', { confirmButtonText: '确定', @@ -2061,7 +2119,7 @@ export default { }, // 删除 deleteNotifySOS(row) { - this.$confirm(`是否删除这个派工单的申请信息?`, '提示', { + this.$confirm(`是否删除这个工单的申请信息?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -2216,4 +2274,17 @@ export default { height: 20px; } + diff --git a/src/views/modules/productionInbound/productionInboundRequest.vue b/src/views/modules/productionInbound/productionInboundRequest.vue index 994de7d..75eca86 100644 --- a/src/views/modules/productionInbound/productionInboundRequest.vue +++ b/src/views/modules/productionInbound/productionInboundRequest.vue @@ -1,390 +1,2217 @@ + +