diff --git a/src/api/request2.js b/src/api/request2.js index 8dc5ef33..c20c616f 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -568,7 +568,7 @@ export function getBasicItemByCodeSenior(itemCode) { }], pageNo: 1, pageSize: 1000 - } + } return request({ url: baseApi + "/wms/itembasic/senior", method: "post", @@ -4114,6 +4114,21 @@ export function getBalanceByFilter(param) { }); } + + +/** + * 查询库存事务 + * @param {*} + * + */ +export function getTransactionByFilter(param) { + return request({ + url: baseApi + "/wms/transaction/senior", + method: "post", + data: param, + }); +} + /** * 查询管理精度，多个物料，多个库位 * @param {*} @@ -4492,4 +4507,31 @@ export function fgChangeCommit(params) { method: "post", data: params, }); -} \ No newline at end of file +} + +/** + * 查询物料与库位关系 + */ +export function checkItemCodeAndLocation(params) { + return request({ + url: baseApi + "/wms/location/checkRecommendLocation", + method: "post", + data: params, + }); +} + +/** + * 库存余额根据业务类型汇总接口 + */ +export function getBalanceByBusinessType(params) { + return request({ + url: baseApi + "/wms/balance/summaryByBusinessType", + method: "get", + data: params, + }); +} + + + + + diff --git a/src/common/record.js b/src/common/record.js index df840606..6cbcb38b 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -39,7 +39,7 @@ export function createDetailInfo(balance, pack) { let detail = deepCopyData(balance); detail.balanceQty = new Decimal(detail.qty).toNumber() detail.qty = new Decimal(detail.qty).toNumber(); - detail.packQty = pack.packQty?new Decimal(pack.packQty).toNumber():0 + detail.packQty = pack.packQty ? new Decimal(pack.packQty).toNumber() : 0 detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber(); detail.package = pack; @@ -49,6 +49,21 @@ export function createDetailInfo(balance, pack) { return detail; } + +export function createDetailByPackInfo(pack) { + + // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; + // data.inventoryStatus = data.inventoryStatus; + let detail = deepCopyData(pack); detail.scaned = true; + detail.balanceQty = new Decimal(detail.qty).toNumber() + detail.qty = new Decimal(detail.qty).toNumber(); + detail.packQty = pack.packQty ? new Decimal(pack.packQty).toNumber() : 0 + detail.packUnit = pack.packUnit + detail.handleQty = new Decimal(detail.qty).toNumber(); + detail.package = pack; + return detail; +} + //计算实际数量 export function calcHandleQty(detailSource) { for (let item of detailSource) { diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue index b4ed53fb..fc5582ab 100644 --- a/src/mycomponents/balance/balance.vue +++ b/src/mycomponents/balance/balance.vue @@ -2,7 +2,8 @@ - + @@ -91,6 +92,10 @@ type: Boolean, default: false }, + isShowParentPack: { + type: Boolean, + default: true + }, }, watch: { diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 4dcd4b84..32d1546f 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -198,6 +198,8 @@ return params; }, reset(){ + this.checkedTodayModel = false + this.checkedWaitModel = false this.productionLineCode = '' this.fromLocationCode = '' this.fromAreaCode = ''// 来源库区 diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue index 0a3bee4d..3e138217 100644 --- a/src/mycomponents/query/balanceQuery.vue +++ b/src/mycomponents/query/balanceQuery.vue @@ -39,28 +39,28 @@ - - + + - 序号 批次 - 库位 + 库位 状态 数量 - {{index+1}} {{item.batch}} {{item.locationCode}} {{statusDesc(item.inventoryStatus)}} - {{item.qty}} + {{item.totalQty}} - + + - + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index fa471c6d..a9689c54 100644 --- a/src/pages.json +++ b/src/pages.json @@ -629,6 +629,41 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/issue/job/issueJob0816", + "style": { + "navigationBarTitleText": "发料任务0816", + "enablePullDownRefresh": true, + "titleNView": { + "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] + } + } + }, + { + "path": "pages/issue/job/issueDetail0816", + "style": { + "navigationBarTitleText": "发料任务详情0816", + "enablePullDownRefresh": false + } + }, { "path": "pages/issue/record/issueRecord", "style": { @@ -784,7 +819,25 @@ "navigationBarTitleText": "直接补料", "enablePullDownRefresh": false, "titleNView": { - "autoBackButton": "true" + "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] } } }, diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index 74c31bcc..ad34b963 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -273,30 +273,43 @@ import { nextTick } from 'vue'; console.log(JSON.stringify(params)) let list = [] - var planData = await planReceiptSubmit(params) - if (planData.data) { - - planData.data.forEach(item => { - list.push({ - itemCode: item.itemCode, // 物品代码 - itemName: item.itemName, // 物品名称 - packName: item.packName, // 包装名称 - packageCode: item.toPackingNumber, // 包装号 - batch: item.toBatch, //批次 - parentNumber: item.parentNumber, //父包装号 - itemType: item.itemType, //物料类型 - asnNumber: item.asnNumber, //ASN - supplierCode: item.supplierCode, // 供应商 - qty: item.qty, // 数量 - printTimes: getCurrDateTime(), // 打印时间 - productionLineCode: item.productionLineCode, //生产线 - barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '', - requestNumber: item.requestNumber + try{ + var planData = await planReceiptSubmit(params) + console.log('planData',planData) + if (planData.data) { + + planData.data.forEach(item => { + list.push({ + itemCode: item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + packName: item.packName, // 包装名称 + packageCode: item.toPackingNumber, // 包装号 + batch: item.toBatch, //批次 + parentNumber: item.parentNumber, //父包装号 + itemType: item.itemType, //物料类型 + asnNumber: item.asnNumber, //ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes: getCurrDateTime(), // 打印时间 + productionLineCode: item.productionLineCode, //生产线 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '', + requestNumber: item.requestNumber + }) }) - }) - } else { - throw new Error("提交失败") + } else { + throw new Error("提交失败") + } + }catch(error){ + console.log('异常',error) + if(error.indexOf('请返回开工阶段')>-1){ + uni.hideLoading() + this.showErrorMessage('计划已完成') + this.clearData() + this.openFg(); + return + } + } //装配收货记录 生成后 创建 制品上架申请 diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index fd6ab5f2..4e77583f 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -1,9 +1,9 @@ @@ -99,7 +99,7 @@ import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue' import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' - // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' + import balanceQuery from '@/mycomponents/query/balanceQuery.vue' export default { @@ -114,7 +114,7 @@ recordDetailCard, balanceSelect, winComScanBalance, - // balanceQuery + balanceQuery }, data() { return { @@ -166,8 +166,8 @@ if (e.index === 0) { goHome(); } else if (e.index == 1) { - // this.$refs.refBalanceQuery.showDrawer(); - // this.closeScanPopup(); + this.$refs.refBalanceQuery.showDrawer(); + this.closeScanPopup(); } }, //拦截返回按钮事件 @@ -178,10 +178,6 @@ mounted() {}, methods: { - // showDrawer() { - // this.$refs.showRight.open(); - // }, - getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { @@ -247,15 +243,71 @@ } }) if (detail == undefined) { - let newDetail = createDetailInfo(balance, pack); - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = pack.packUnit; - newDetail.packQty = pack.packQty; - if (balance.lableQty) { - newDetail.handleQty = balance.lableQty + //如果最开始扫父，在扫子，提示已经扫描父包装 + //如果扫子在扫父，提示扫描的是父包装，是否移除子包装，是移除子包装，显示父包装 + //扫描的是子包装, + if (pack.parentNumber) { + var checkData = item.subList.find(r => { + if (r.packingNumber == pack.parentNumber && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //提示已经扫描 + this.showErrorMessage("扫描箱码[" + pack.number + "]批次[" + balance.batch + + "]的父包装已经扫描") + console.log("父包装已经扫描") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + } else { + //扫描的是父包装 + var checkData = item.subList.find(r => { + if (r.parentNumber == pack.number && + r.batch == balance.batch) { + return r; + } + }) + if (checkData) { + //是否移除 + this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance + .batch + "]是父包装，是否移除子包装", res => { + if (res) { + item.subList = []; + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } + }) + console.log("扫描的是父包装，是否移除子包装") + } else { + let newDetail = createDetailInfo(balance, pack); + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + item.subList.push(newDetail); + } } - item.subList.push(newDetail); + this.scanPopupGetFocus() } else { if (detail.scaned == true) { @@ -390,11 +442,11 @@ // }, commit() { - if(this.positionInfo=='请选择生产线'||!this.positionInfo){ + if (this.positionInfo == '请选择生产线' || !this.positionInfo) { this.showErrorMessage("请选择生产线") return } - + uni.showLoading({ title: "提交中....", mask: true diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue index 8efa0038..d1d4b493 100644 --- a/src/pages/issue/record/directIssue0816.vue +++ b/src/pages/issue/record/directIssue0816.vue @@ -18,9 +18,8 @@ + @removePack="removePack" :isShowParentPack="false"> - @@ -45,9 +44,10 @@ - - - + + + @@ -57,7 +57,7 @@ import { issueRecordSubmit, getWorkShopLineStation, - getBalanceByFilter + getTransactionByFilter } from '@/api/request2.js'; import { @@ -79,6 +79,7 @@ getBusinessType, createItemInfo, createDetailInfo, + createDetailByPackInfo, calcTreeHandleQty, calcHandleQty } from '@/common/record.js'; @@ -100,7 +101,7 @@ import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' - + import winScanParentPackage from '@/mycomponents/scan/winScanParentPackage.vue' export default { components: { @@ -114,6 +115,7 @@ recordDetailCard, balanceSelect, winComScanBalance, + winScanParentPackage // balanceQuery }, data() { @@ -181,7 +183,6 @@ // showDrawer() { // this.$refs.showRight.open(); // }, - getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { @@ -197,72 +198,117 @@ getScanResult(result) { let pack = result.package; - let balance = result.balance; + let childBalance = result.balance.childBalance; + let parentBalance = result.balance.parentBalance[0]; + //1.先判断是否重复扫描 + if (this.itemCode) { + var item = this.detailSource.find(res => res.itemCode == pack.itemCode) + if (item == undefined) { + this.showErrorMessage("请扫描物料为【" + this.itemCode + "】不在此次发料记录中") + return; + } + if (item.subList.length > 0) { + var detail = item.subList.find(r => { + if (r.packingNumber == pack.number && + r.batch == pack.batch) { + return r; + } + }) - if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this - .fromLocationCode + "]没有库存余额") - return; + if (detail && detail.scaned) { + this.showErrorMessage("箱码[" + pack.number + "批次[" + pack.batch + "]重复扫描") + return; + } + } } + //2.向列表中增加明细 //扫描的是子包装 if (pack.parentNumber) { - this.setPackageData(result); + //子包装没有库存 + if (childBalance.length == 0) { + this.getTransactionList(pack.number, transactionRes => { + if (transactionRes.length == 0) { + this.setPackageData(parentBalance, pack); + } else { + this.showErrorMessage("箱码[" + pack.number + "批次[" + pack.batch + + "]已经发过料") + } + }); + } else { //子包装有库存 + this.setPackageData(childBalance[0], pack); + } } else { - this.setContainerData(result); + //扫描的是没有父包装的，自己就是子包装 + if(pack.subList.length==0){ + this.getTransactionList(pack.number, transactionRes => { + if (transactionRes.length == 0) { + this.setPackageData(childBalance[0], pack); + } else { + this.showErrorMessage("箱码[" + pack.number + "批次[" + pack.batch + + "]已经发过料") + } + }); + }else { + let packparams = ''; + pack.subList.forEach(pack => { + packparams = packparams + pack.number + ',' + }) + packparams = packparams.trimEnd(','); + this.getTransactionList(packparams, transactionRes => { + //扫描的是父包装，要过滤掉不在超市的库存，加上没有的库存 + pack.subList.forEach(sub => { + let subBalance = childBalance.find(r => r.packingNumber == sub.number); + if (subBalance) { + //校验父包装和子包装是否在一个库位 + if (subBalance.locationCode == parentBalance.locationCode) { + this.setPackageData(subBalance, sub); + } else { + //不在一个库位暂时先不加 + } + + } else { + //如果子包装没有库存，取父包装库存 + //查询是不是已经出过库，在发料任务中产生了出库库存事务 + let transaction = transactionRes.find(p => p.packingNumber == sub + .number) + if (!transaction) { + this.setPackageData(parentBalance, sub); + } + } + }) + }) + } + } }, - setPackageData(result) { - let balance = result.balance; - let label = result.label; - let pack = result.package; - + setPackageData(balance, pack) { var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) { return res } }) if (item == undefined) { - if (this.itemCode != "" && this.itemCode != balance.itemCode) { - this.showErrorMessage("请扫描物料为【" + this.itemCode + "】的箱码") - return; - } - if (this.fromWarehouseCode == '') { - this.fromWarehouseCode = balance.warehouseCode; - } var itemp = createItemInfo(balance, pack); - let newDetail = createDetailInfo(balance, pack); // - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = pack.packUnit; - newDetail.packQty = pack.packQty; - if (balance.lableQty) { - newDetail.handleQty = balance.lableQty - } + let newDetail = this.createPackageDetail(balance, pack); itemp.subList.push(newDetail); - this.detailSource.push(itemp) + this.detailSource.push(itemp); this.itemCode = balance.itemCode; - this.fromLocationCode = balance.locationCode + this.fromLocationCode = balance.locationCode; + this.fromWarehouseCode = balance.warehouseCode; this.scanPopupGetFocus() } else { var detail = item.subList.find(r => { if (r.packingNumber == pack.number && - r.batch == balance.batch && - r.locationCode == balance.locationCode && + r.batch == pack.batch && + r.locationCode == pack.locationCode && r.inventoryStatus == balance.inventoryStatus) { return r; } }) if (detail == undefined) { - let newDetail = createDetailInfo(balance, pack); - newDetail.parentNumber = pack.parentNumber; - newDetail.packingNumber = pack.number - newDetail.packUnit = pack.packUnit; - newDetail.packQty = pack.packQty; - if (balance.lableQty) { - newDetail.handleQty = balance.lableQty - } + let newDetail = this.createPackageDetail(balance, pack); item.subList.push(newDetail); this.scanPopupGetFocus() } else { @@ -274,73 +320,55 @@ calcHandleQty(this.detailSource); }, - setContainerData(result) { - //1.查询托和箱所有的库存 - this.getBalance(result, resList => { - - }); - }, - - getBalance(result, callback) { - let packageInfo = result.package; - let filters = [{ - column: "itemCode", - action: "==", - value: packageInfo.itemCode - }, { - column: "batch", - action: "==", - value: packageInfo.batch - }]; - if (this.businessType.outInventoryStatuses != null) { - filters.push({ - column: "inventoryStatus", - action: "in", - value: this.businessType.outInventoryStatuses - }) - } - if (this.businessType.outAreaTypes != null) { - filters.push({ - column: "areaType", + //查询发料的业务类型 + getTransactionList(packingNumbers, callback) { + let params = { + filters: [{ + column: "businessType", + action: "==", + value: "发料" + }, { + column: "packingNumber", action: "in", - value: this.businessType.outAreaTypes - }) - } - - - let packingNumber = packageInfo.number; - packageInfo.subList.forEach(sub => { - packingNumber = packingNumber + ',' + sub.number - }) - packingNumber = packingNumber.trimEnd(','); - filters.push({ - column: "packingNumber", - action: "in", - value: packingNumber - }) - var params = { - filters: filters, + value: packingNumbers + }, { + column: "inventoryAction", + action: "==", + value: "OUT" + }], + pageSize: 20, pageNo: 1, - pageSize: 100, + sort: "", + by: "ASC" } - getBalanceByFilter(params).then(res => { - if (res.data.list.length > 0) { - res.data.list.forEach(r => { - // if (packageInfo.parentNumber !== null) { - // r.parentPackingNumber = packageInfo.parentNumber - // } else { - // r.parentPackingNumber = packageInfo.number - // } - }) - callback(res.data.list) - } else { - } + getTransactionByFilter(params).then(res => { + callback(res.data.list); }).catch(err => { - this.showErrorMessage(err.message); + callback([]); }) }, + + createPackageDetail(balance, pack) { + let newDetail = {}; + if (balance.packingNumber != pack.number) { + newDetail = createDetailByPackInfo(pack); + newDetail.inventoryStatus = balance.inventoryStatus; + } else { + newDetail = createDetailInfo(balance, pack); + if (balance.lableQty) { + newDetail.handleQty = balance.lableQty + } + } + newDetail.parentNumber = pack.parentNumber; + newDetail.packingNumber = pack.number + newDetail.packUnit = pack.packUnit; + newDetail.packQty = pack.packQty; + return newDetail; + }, + + showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => { if (res) { @@ -432,12 +460,18 @@ this.updateData(); }, + // openScanPopup() { + // if (this.businessType) { + // this.$refs.scanPopup.openScanPopup(this.businessType); + // } else { + // this.getBusinessType() + // } + // }, + openScanPopup() { - if (this.businessType) { - this.$refs.scanPopup.openScanPopup(this.businessType); - } else { - this.getBusinessType() - } + setTimeout(r => { + this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType); + }) }, showFromLocationPopup() { diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 71ac4b30..f6c8f562 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -157,18 +157,21 @@ } }, - onLoad() { - getCaptchaImage().then(res => { - if (res) { - var code = res.data.img; - let base64 = 'data:image/jpeg;base64,' + code - // console.log("图标", base64) - this.imageSrc = base64.replace(/[\r\n]/g, "") - this.uuid = res.data.uuid - } - }).catch(error => { - this.showErrorMessage(error); - }) + onLoad() { + if(this.needCode){ + getCaptchaImage().then(res => { + if (res) { + var code = res.data.img; + let base64 = 'data:image/jpeg;base64,' + code + // console.log("图标", base64) + this.imageSrc = base64.replace(/[\r\n]/g, "") + this.uuid = res.data.uuid + } + }).catch(error => { + this.showErrorMessage(error); + }) + } + this.getAppVersion() }, methods: { diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index d3362b7d..f2dab7c8 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -10,6 +10,7 @@ @@ -147,6 +148,7 @@ getScanResult(result) { let label = result.label; let pack = result.package; + let errorHint="" result.balance.forEach( balance => { let item = this.detailSource.find(res => { @@ -180,14 +182,19 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + - "]重复扫描") + errorHint+="箱码[" + balance.packingNumber + "批次[" + balance.batch + + "]重复扫描\n" } } } this.calcHandleQty(); } ) + if(errorHint){ + this.showErrorMessage(errorHint) + }else { + this.scanPopupGetFocus() + } }, getRecommendLocation(balance) { @@ -251,9 +258,6 @@ this.$forceUpdate(); }, - updateData() { - this.calcHandleQty(); - }, removeItem(index, item) { this.removeRecommendLocation([item.expectinNumber]); this.detailSource.splice(index, 1) @@ -423,13 +427,6 @@ if (res) {} }); }, - showErrorMessage(message) { - this.$refs.comMessage.showErrorMessage(message, res => { - if (res) { - - } - }); - }, showScanMessage(message) { this.$refs.comMessage.showScanMessage(message); diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index fbfe4c8a..c702a838 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -231,7 +231,14 @@ that.subList = res.data.subList; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode - that.productionLineCode = that.subList[0].productionLineCode; + that.productionLineCode = that.subList[0].productionLineCode; + var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate") + if(valiDate){ + that.jobContent.allowModifyLocation = 'TRUE' + + }else{ + that.jobContent.allowModifyLocation = 'FALSE' + } // if (that.jobContent.allowModifyLocation == 'FALSE') { // that.toLocationCode = that.subList[0].toLocationCode // } diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 1c6c3cb3..6cf39a85 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -226,11 +226,16 @@ that.subList = res.data.subList; that.jobStatus = res.data.status; that.jobToLocationCode = that.subList[0].toLocationCode; - that.productionLineCode = that.jobContent.subList[0].productionLineCode; - - if (that.jobContent.allowModifyLocation == 'FALSE') { - that.toLocationCode = that.subList[0].toLocationCode + that.productionLineCode = that.jobContent.subList[0].productionLineCode; + var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate") + if(valiDate){ + that.jobContent.allowModifyLocation = 'TRUE' + }else{ + that.jobContent.allowModifyLocation = 'FALSE' } + // if (that.jobContent.allowModifyLocation == 'FALSE') { + // that.toLocationCode = that.subList[0].toLocationCode + // } that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) if (that.scanMessage) { diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 3968605d..56c41363 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -34,7 +34,7 @@ :locationAreaTypeList="toLocationAreaTypeList"> - + diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index fe5f82a4..a78c388d 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -460,6 +460,17 @@ }else{ this.filterItemCode = '' } + if (params.status) { + this.status = params.status + + }else{ + this.status = "1,2" + } + if(params.creationTime==""){ + this.checkedToday = false; + } + this.todayTime = params.creationTime + this.getList('refresh', this.productionLine, this.filterItemCode) }, diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 9662d144..5fc5f1d9 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -5,10 +5,11 @@ - - 来源库位 : {{fromLocationCode}} + + + 来源库位 : {{fromLocationCode}} + - @@ -16,7 +17,10 @@ + :isShowModifedLocation="true" + @updateData="updateData" + @editLocation="showScanToLocation" + @removePack="removePack"> @@ -43,14 +47,17 @@ +