From 98f6a409bdd9af8c4842c140355479782f69d58a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 12 Mar 2024 15:18:32 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pages.json b/src/pages.json index 1c46f45b..460a6a78 100644 --- a/src/pages.json +++ b/src/pages.json @@ -340,6 +340,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/inspect/job/inspectResult", + "style": { + "navigationBarTitleText": "检验详情", + "enablePullDownRefresh": true + } + }, { "path": "pages/putaway/job/putawayJob", "style": { From 3cffde3b2f1b1948bb5265eca93ffe5e70978b23 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Mar 2024 09:22:28 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=B2=A1=E6=94=B6=E8=B4=A7=E7=9A=84?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 +++++++ .../purchaseReceipt/job/receiptDetail.vue | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/pages.json b/src/pages.json index 460a6a78..5f149645 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1325,6 +1325,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/inventoryMove/record/scrapToHoldRecord", + "style": { + "navigationBarTitleText": "报废转隔离记录", + "enablePullDownRefresh": true + } + }, { "path": "pages/inventoryMove/record/okToHoldRecord", "style": { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 2d2f02e0..545f4e95 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -435,13 +435,19 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { - if (detail.scaned) { - var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, - detail.packingNumber, detail.batch); - detail.toPackingNumber = info.packingNumber; - detail.toBatch = info.batch; - subList.push(detail) + if(!detail.scaned){ + detail.handleQty=0 } + detail.packList.forEach(pack=>{ + if(!pack.scaned){ + pack.handleQty=0 + } + }) + var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, + detail.packingNumber, detail.batch); + detail.toPackingNumber = info.packingNumber; + detail.toBatch = info.batch; + subList.push(detail) }) }) this.jobContent.subList = subList From db2b76947ea1335d39d7812cd0d7e0b6e4887943 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Mar 2024 14:36:52 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/basic.js | 6 +-- src/common/detail.js | 4 +- src/common/directory.js | 2 +- src/common/record.js | 8 ++-- src/mycomponents/detail/detailBalanceInfo.vue | 2 +- src/mycomponents/detail/detailHandleInfo.vue | 2 +- src/mycomponents/detail/detailPackageInfo.vue | 4 +- .../detail/detailRecommendInfo.vue | 2 +- src/mycomponents/detail/jobDetailPopup.vue | 6 +-- src/mycomponents/job/jobDetailPopup.vue | 6 +-- .../package/packageDetailPopup.vue | 4 +- src/mycomponents/partCode/partCode.vue | 4 +- src/mycomponents/qty/balanceQty.vue | 8 ++-- src/mycomponents/qty/balanceQtyEdit.vue | 8 ++-- src/mycomponents/qty/compareQty.vue | 4 +- src/mycomponents/qty/countQtyEdit.vue | 16 ++++---- src/mycomponents/qty/inspectQtyEdit.vue | 2 +- src/mycomponents/qty/packQty.vue | 37 +++++++++++++++++++ src/mycomponents/qty/qty.vue | 4 +- src/mycomponents/qty/recommendQty.vue | 4 +- src/mycomponents/qty/recommendQtyEdit.vue | 6 +-- src/mycomponents/qty/stdPackQty.vue | 37 ------------------- src/mycomponents/qty/stdUom.vue | 8 ++-- src/mycomponents/wincom/basicCom/winHint.vue | 2 +- .../container/record/containerBindRecord.vue | 4 +- .../record/containerUnBindRecord.vue | 4 +- src/pages/count/job/countDetail.vue | 20 +++++----- src/pages/count/record/countRecord.vue | 8 ++-- src/pages/customerReturn/job/returnDetail.vue | 8 ++-- .../deliver/coms/comDeliverRequestPopup.vue | 2 +- src/pages/deliver/coms/comScanDeliverPack.vue | 4 +- src/pages/demo/demo.vue | 12 +++--- .../inventoryMove/job/inventoryMoveDetail.vue | 8 ++-- .../issue-按批次推荐/job/issueDetail.vue | 4 +- src/pages/issue/coms/comIssueRequestPopup.vue | 6 +-- src/pages/issue/coms/comScanIssuePack.vue | 4 +- src/pages/issue/js/issue.js | 2 +- .../job/productPutawayDetail.vue | 8 ++-- .../productReceipt/coms/detailInfoPopup.vue | 4 +- .../coms/productDetailInfoPopup.vue | 10 ++--- .../record/productReceiptRecord.vue | 8 ++-- .../job/productionReceiptDetail.vue | 8 ++-- src/pages/productionReturn/coms/comReturn.vue | 8 ++-- .../coms/comReturnRequestPopup.vue | 6 +-- .../coms/comScanReturnPack.vue | 4 +- .../coms/returnDetailInfoPopup.vue | 10 ++--- .../productionReturn/job/returnDetail.vue | 12 +++--- .../productionReturn/record/returnToHold.vue | 8 ++-- .../productionReturn/record/returnToStore.vue | 8 ++-- .../coms/receiptDetailInfoPopup.vue | 12 +++--- src/pages/purchaseReturn/job/returnDetail.vue | 8 ++-- src/pages/putaway/job/putawayDetail.vue | 8 ++-- .../coms/comRepleinshRequestPopup.vue | 6 +-- .../repleinsh/coms/comScanReplishPack.vue | 4 +- src/pages/scrap/coms/scrapDetailInfoPopup.vue | 4 +- src/pages/scrap/job/scrapJobDetail.vue | 8 ++-- .../coms/recordDetailInfoPopup.vue | 4 +- .../coms/recordtDetailInfoPopup.vue | 4 +- src/pages/transfer/job/issueDetail.vue | 8 ++-- src/pages/transfer/job/receiptDetail.vue | 10 ++--- src/pages/transfer/job/transferDetail.vue | 4 +- .../unPlanned/coms/comReceiptRequestPopup.vue | 6 +-- src/pages/unPlanned/job/issueJobDetail.vue | 8 ++-- src/pages/unPlanned/job/receiptJobDetail.vue | 2 +- src/pages/unPlanned/record/receiptRecord.vue | 8 ++-- 65 files changed, 235 insertions(+), 235 deletions(-) create mode 100644 src/mycomponents/qty/packQty.vue delete mode 100644 src/mycomponents/qty/stdPackQty.vue diff --git a/src/common/basic.js b/src/common/basic.js index 2c70dc66..3288bec0 100644 --- a/src/common/basic.js +++ b/src/common/basic.js @@ -191,7 +191,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") @@ -957,8 +957,8 @@ export function createItemInfo(res) { let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: Number(res.stdPackQty), - stdPackUnit: res.stdPackUnit, + packQty: Number(res.packQty), + packUnit: res.packUnit, qty: Number(res.qty), handleQty: 0, uom: res.uom, diff --git a/src/common/detail.js b/src/common/detail.js index 993f2fb8..4fd36866 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -67,8 +67,8 @@ export function createItemInfo(detail) { let item = { itemCode: detail.itemCode, itemName: detail.itemName, - stdPackQty: Number(detail.stdPackQty) || undefined, - stdPackUnit: detail.stdPackUnit, + packQty: Number(detail.packQty) || undefined, + packUnit: detail.packUnit, qty: Number(detail.qty), handleQty: 0, uom: detail.uom, diff --git a/src/common/directory.js b/src/common/directory.js index e7aa2ebc..63139129 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -263,7 +263,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") diff --git a/src/common/record.js b/src/common/record.js index f4a988c1..65f102f2 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -15,8 +15,8 @@ export function createItemInfo(balance, pack) { let item = { itemCode: pack.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: new Decimal(balance.qty).toNumber(), handleQty:new Decimal(0).toNumber(), uom: pack.uom, @@ -32,8 +32,8 @@ export function createDetailInfo(balance, pack) { let detail = deepCopyData(balance); detail.balanceQty = new Decimal(detail.qty).toNumber() detail.qty = new Decimal(detail.qty).toNumber(); - detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber() - detail.stdPackUnit = pack.stdPackUnit + detail.packQty = new Decimal(pack.packQty).toNumber() + detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber() ; detail.package = pack; diff --git a/src/mycomponents/detail/detailBalanceInfo.vue b/src/mycomponents/detail/detailBalanceInfo.vue index 573e393f..43cfb89b 100644 --- a/src/mycomponents/detail/detailBalanceInfo.vue +++ b/src/mycomponents/detail/detailBalanceInfo.vue @@ -32,7 +32,7 @@ + + + diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue index f2d55dcc..827b92dc 100644 --- a/src/mycomponents/qty/qty.vue +++ b/src/mycomponents/qty/qty.vue @@ -15,13 +15,13 @@ - - - diff --git a/src/mycomponents/qty/stdUom.vue b/src/mycomponents/qty/stdUom.vue index 03508a7f..7a495d07 100644 --- a/src/mycomponents/qty/stdUom.vue +++ b/src/mycomponents/qty/stdUom.vue @@ -1,13 +1,13 @@ \ No newline at end of file diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue index de08a406..f56df994 100644 --- a/src/mycomponents/package/packageCard.vue +++ b/src/mycomponents/package/packageCard.vue @@ -59,7 +59,7 @@ props: { dataContent: { type: Object, - default: {} + default: null }, isShowContainer: { type: Boolean, diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue index 2e63aca4..5734021c 100644 --- a/src/mycomponents/package/packageList.vue +++ b/src/mycomponents/package/packageList.vue @@ -5,8 +5,8 @@ + + + + + + + + + + + + + + + + + + + + + 复制 + + + + + + + + + \ No newline at end of file diff --git a/src/mycomponents/package/packageRecordList.vue b/src/mycomponents/package/packageRecordList.vue new file mode 100644 index 00000000..1ecdac3b --- /dev/null +++ b/src/mycomponents/package/packageRecordList.vue @@ -0,0 +1,195 @@ + + + + + + \ No newline at end of file diff --git a/src/mycomponents/qty/balanceQty.vue b/src/mycomponents/qty/balanceQty.vue index 58e339c9..11fa2ed9 100644 --- a/src/mycomponents/qty/balanceQty.vue +++ b/src/mycomponents/qty/balanceQty.vue @@ -9,7 +9,7 @@ - + @@ -18,12 +18,14 @@ import packQty from '@/mycomponents/qty/packQty.vue' import uom from '@/mycomponents/qty/uom.vue' import status from '@/mycomponents/status/status.vue' + import packUnit from '@/mycomponents/qty/packUnit.vue' export default { components: { packQty, uom, - status + status, + packUnit }, data() { return { diff --git a/src/mycomponents/qty/packQty.vue b/src/mycomponents/qty/packQty.vue index ee5df1c9..d8893220 100644 --- a/src/mycomponents/qty/packQty.vue +++ b/src/mycomponents/qty/packQty.vue @@ -7,7 +7,6 @@ + + \ No newline at end of file diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue new file mode 100644 index 00000000..ba630c80 --- /dev/null +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index 0ef7c08f..f79d579c 100644 --- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -6,7 +6,7 @@ - + diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 545f4e95..3d5c268d 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -254,7 +254,6 @@ this.showMessage("物料号【" + itemCode + "】不在列表中") } else { //物料在列表中 - var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch); if (itemDetail == undefined) { diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 6354fa30..8515a896 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -14,10 +14,9 @@ - - + + @@ -38,7 +37,7 @@ - + @@ -61,7 +60,8 @@ goHome, getCurrDateTime, getPackingNumberAndBatch, - navigateBack + navigateBack, + compareAsc } from '@/common/basic.js'; import { @@ -70,14 +70,15 @@ } from '@/common/directory.js'; import { - getDataSource, + getTreeDataSource, calcHandleQty, + calcTreeHandleQty, getScanCount } from '@/common/detail.js'; import winScanButton from '@/mycomponents/scan/winScanButton.vue' - import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" - import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" + import winScanPackAndLocationNoBalance from "@/mycomponents/scan/winScanPackAndLocationNoBalance.vue" + import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue" import locationCompare from '@/mycomponents/location/locationCompare.vue' import jobTop from '@/mycomponents/job/jobTop.vue' @@ -85,9 +86,9 @@ export default { components: { winScanButton, - winScanPackAndLocation, + winScanPackAndLocationNoBalance, locationCompare, - comDetailCard, + comJobDetailCard, jobTop }, data() { @@ -178,7 +179,7 @@ that.jobContent = res.data; that.jobStatus = res.data.status that.subList = res.data.subList; - that.detailSource = getDataSource(that.subList) + that.detailSource = getTreeDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode; @@ -207,7 +208,7 @@ }, calcHandleQty() { - calcHandleQty(this.detailSource); + calcTreeHandleQty(this.detailSource); this.continueScan() this.$forceUpdate(); }, @@ -254,12 +255,12 @@ getScanResult(result) { try { - var packingNumber = result.balance.packingNumber; - var batch = result.balance.batch; - var qty = result.balance.qty; - var itemCode = result.balance.itemCode; - var locationCode = result.balance.locationCode; - var inventoryStatus = result.balance.inventoryStatus; + var packingNumber = result.label.packingNumber; + var batch = result.label.batch; + var qty = result.label.qty; + var itemCode = result.label.itemCode; + var locationCode = result.fromLocationCode; + var inventoryStatus = "OK"; var detail = this.detailSource.find(r => r.itemCode == itemCode); if (detail == undefined) { @@ -270,53 +271,63 @@ r.batch == batch && r.fromLocationCode == result.fromLocationCode }) + if (itemDetail == undefined) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result - .fromLocationCode + "】不在列表中") - } else { - if (itemDetail.scaned) { - this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result - .fromLocationCode + "】已经扫描") - } else { - let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); - let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); - if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if (this.jobContent.allowModifyInventoryStatus == "TRUE") { - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + - itemStatus + - ']不一致,是否继续上架?', res => { - if (res) { - itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty); - itemDetail.toInventoryStatus = result.balance.inventoryStatus - itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.packQty = Number(result.package.packQty) - itemDetail.balance.packUnit = result.package.packUnit - this.calcHandleQty(); - } else { - this.scanPopupGetFocus(); - } - }); - } else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + - itemStatus + - ']不一致,不允许转移!', res => { - this.scanPopupGetFocus(); - }); + var isExit; + for (let subItem of detail.subList) { + var item; + for (let pack of subItem.packList) { + if (pack.packingNumber == packingNumber && + pack.batch == batch) { + item = pack; + isExit = pack; + break; } - + } + if (item != undefined) { + subItem.scaned = true + subItem.handleQty = 0; + item=undefined + } + } + if(isExit == undefined){ + this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result + .fromLocationCode + "】不在列表中") + }else { + if (isExit.scaned) { + this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { - itemDetail.scaned = true; - itemDetail.handleQty = Number(result.balance.qty); - itemDetail.toInventoryStatus = itemDetail.inventoryStatus - itemDetail.balance = result.balance; - itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.packQty = Number(result.package.packQty) - itemDetail.balance.packUnit = result.package.packUnit - this.calcHandleQty(); + isExit.scaned = true + isExit.handleQty = Number(result.label.qty); + isExit.toLocationCode = this.toLocationCode; } } + calcTreeHandleQty(this.detailSource); + this.$forceUpdate() + } else { + var scanedLength =0; + itemDetail.packList.forEach(res=>{ + if(res.scaned){ + scanedLength++; + } + }) + if (itemDetail.scaned&&scanedLength==itemDetail.packList.length) { + this.showMessage("箱码【" + packingNumber + "】已经扫描") + } else { + itemDetail.scaned = true; + this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序 + itemDetail.handleQty = result.label.qty; + itemDetail.toInventoryStatus = "OK" + itemDetail.packList.forEach(pac => { + pac.scaned = true + pac.handleQty = Number(pac.qty); + pac.toLocationCode = this.toLocationCode; + }) + + calcTreeHandleQty(this.detailSource); + this.continueScan() + this.$forceUpdate() + } } } } catch (e) { @@ -436,13 +447,20 @@ detail.toPackingNumber = info.packingNumber; detail.toBatch = info.batch; detail.toContainerNumber = ''; - - detail.singlePrice = detail.balance.singlePrice; - detail.amount = detail.balance.singlePrice * detail.handleQty; - - detail.arriveDate = detail.balance.arriveDate; - detail.produceDate = detail.balance.produceDate; - detail.expireDate = detail.balance.expireDate; + + detail.singlePrice = 1; + detail.amount = 11; + + detail.arriveDate = getCurrDateTime(); + detail.produceDate = getCurrDateTime(); + detail.expireDate = getCurrDateTime(); + + // detail.singlePrice = detail.balance.singlePrice; + // detail.amount = detail.balance.singlePrice * detail.handleQty; + + // detail.arriveDate = detail.balance.arriveDate; + // detail.produceDate = detail.balance.produceDate; + // detail.expireDate = detail.balance.expireDate; subList.push(detail) } }) diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index be7af0be..a6c1680f 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -15,10 +15,10 @@ - - + @@ -76,7 +76,7 @@ getBusinessType, createItemInfo, createDetailInfo, - calcHandleQty + calcTreeHandleQty } from '@/common/record.js'; import { @@ -92,7 +92,8 @@ import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' - + import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue' + export default { components: { winScanButton, @@ -101,7 +102,8 @@ comBlankView, winScanLocation, winScanPackAndLocation, - recordComDetailCard + recordComDetailCard, + recordDetailCard }, data() { return { @@ -168,32 +170,29 @@ newDetail.toLocationCode = toLocation.code; newDetail.toWarehouseCode = toLocation.warehouseCode; itemp.subList.push(newDetail); + var dataList = pack.subList this.detailSource.push(itemp) + this.detailSource.forEach(res=>{ + res.subList.forEach(pack=>{ + pack.packList = dataList.filter(c=>c.parentNumber==pack.packingNumber) + pack.packList.forEach(pac=>{ + pac.parentPackingNumber =pac.parentNumber; + pac.packingNumber =pac.number; + pac.inventoryStatus="OK"; + pac.scaned=true; + }) + }) + }) }) } else { - var detail = item.subList.find(r => { - if (r.packingNumber == balance.packingNumber && - r.batch == balance.batch && - r.locationCode == balance.locationCode && - r.inventoryStatus == balance.inventoryStatus) { - return r; - } - }) - if (detail == undefined) { - this.getRecommendLocation(balance, pack, toLocation => { - let newDetail = createDetailInfo(balance, pack); - newDetail.toLocationCode = toLocation.code; - newDetail.toWarehouseCode = toLocation.warehouseCode; - item.subList.push(newDetail); - }); - } else { - if (detail.scaned == true) { + var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch == + balance.batch); + if(itemDetail!=undefined){ this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") } - } } - this.calcHandleQty(); + // calcTreeHandleQty(this.detailSource); }, //获取推荐库位 @@ -235,7 +234,7 @@ }); }, - calcHandleQty() { + calcTreeHandleQty() { for (let item of this.detailSource) { item.qty = 0; for (let detail of item.subList) { @@ -248,7 +247,7 @@ }, updateData() { - this.calcHandleQty(); + this.calcTreeHandleQty(); }, removeItem(index, item) { @@ -449,7 +448,7 @@ }, updateData() { - this.calcHandleQty(); + // this.calcTreeHandleQty(); for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i]; if (item.qty == 0) { From 086fc126d9913e0f398e7d33b30afe65c84d8145 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 14 Mar 2024 17:58:40 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/detail/comJobDetailCard.vue | 34 +++++-------- src/mycomponents/package/packageList.vue | 48 +++++++++++++------ .../scan/winScanPackAndLocationNoBalance.vue | 2 +- .../coms/comReceiptDetailCard.vue | 4 ++ .../purchaseReceipt/job/receiptDetail.vue | 3 +- src/pages/putaway/job/putawayDetail.vue | 5 +- 6 files changed, 54 insertions(+), 42 deletions(-) diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue index 0ef7c08f..3988d82f 100644 --- a/src/mycomponents/detail/comJobDetailCard.vue +++ b/src/mycomponents/detail/comJobDetailCard.vue @@ -6,15 +6,17 @@ - + - - @@ -36,6 +38,7 @@ } from '@/common/array.js'; export default { + emits: ["updateData"], components: { itemCompareQty, recommend, @@ -124,12 +127,8 @@ }, swipeClick(e, item) { - if (e.content.text == "详情") { - this.detail(item) - } else if (e.content.text == "编辑") { + if (e.content.text == "编辑") { this.edit(item) - } else if (e.content.text == "库位") { - this.showLocation(item) } else if (e.content.text == "移除") { this.remove(item) } @@ -138,20 +137,6 @@ this.editItem = item; this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty); }, - showLocation(item) { - this.locatonItem = item; - this.$refs.scanLocationCode.openScanPopup(); - }, - //扫描源库位 - getLocation(location, code) { - this.locatonItem.toLocationCode = code; - this.$emit('updateData') - }, - - detail(item) { - this.showItem = item; - this.$refs.jobDetailPopup.openPopup(item) - }, remove(item) { this.$refs.message.showQuestionMessage("确定移除扫描信息?", res => { @@ -166,6 +151,9 @@ confirm(qty) { this.editItem.handleQty = qty; this.$emit('updateData') + }, + updateData(){ + this.$emit('updateData') } } } diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue index 5734021c..10f12497 100644 --- a/src/mycomponents/package/packageList.vue +++ b/src/mycomponents/package/packageList.vue @@ -5,15 +5,18 @@ - - - - + + + + + + @@ -21,6 +24,7 @@ + @@ -35,7 +39,7 @@ getEditRemoveOption } from '@/common/array.js'; export default { - emits: ["collapseChange"], + emits: ["collapseChange", "updateData"], components: { packageCard, recommendQtyEdit @@ -46,12 +50,12 @@ editItem: {}, options: [], removeOptions: [], - editAndRemoveOptions:[] + editAndRemoveOptions: [] } }, mounted() { this.removeOptions = getRemoveOption(); - this.editAndRemoveOptions =getEditRemoveOption() + this.editAndRemoveOptions = getEditRemoveOption() }, props: { dataContent: { @@ -91,7 +95,7 @@ type: Object, default: null }, - isEdit:{ + isEdit: { type: Boolean, default: false } @@ -104,8 +108,22 @@ swipeClick(e, item) { if (e.content.text == "编辑") { this.edit(item) + } else if (e.content.text == "移除") { + this.remove(item) } }, + remove(item) { + this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?", + res => { + if (res) { + item.scaned = false + item.handleQty = 0 + this.$emit('updateData') + this.$forceUpdate() + } + }); + }, + edit(item) { this.editItem = item; this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty); @@ -180,11 +198,11 @@ isDevlement() { return config.isDevelopment; }, - confirm(qty){ - this.editItem.handleQty =qty; + confirm(qty) { + this.editItem.handleQty = qty; this.$emit("updateData") } - + } } diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index ba630c80..9c1b4781 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -28,7 +28,7 @@ + style='height: 30rpx;border:1px solid #fff ;'> diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index f79d579c..ed3d3bdc 100644 --- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -36,6 +36,7 @@ } from '@/common/array.js'; export default { + components: { itemCompareQty, recommend, @@ -166,6 +167,9 @@ confirm(qty) { this.editItem.handleQty = qty; this.$emit('updateData') + }, + updateData(){ + this.$emit('updateData') } } } diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 3d5c268d..71aa0e8f 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -334,7 +334,8 @@ }, updateData() { - calcHandleQty(this.detailSource); + calcTreeHandleQty(this.detailSource) + // calcHandleQty(this.detailSource); }, scanLocationCode(location, code) { diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 8515a896..55e831bc 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -39,7 +39,6 @@ - @@ -224,7 +223,9 @@ }, updateData() { - this.calcHandleQty(); + console.log("updateData") + // this.calcHandleQty(); + calcTreeHandleQty(this.detailSource) }, openScanPopup() { From ac9d1b045891022c8088cfbaa021e6711c66d459 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Mar 2024 11:01:29 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/detail.js | 10 +- src/mycomponents/package/packageList.vue | 2 +- src/pages.json | 7 + src/pages/issue/request/issueScanRequest.vue | 144 ++++++++++++++++++ .../purchaseReceipt/job/receiptDetail.vue | 23 +-- 5 files changed, 170 insertions(+), 16 deletions(-) create mode 100644 src/pages/issue/request/issueScanRequest.vue diff --git a/src/common/detail.js b/src/common/detail.js index 4fd36866..9cfb545f 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -118,10 +118,12 @@ export function calcTreeHandleQty(detailSource) { for (let detail of item.subList) { if (detail != undefined && detail.scaned) { - detail.handleQty = new Decimal(0).toNumber(); - for (let pack of detail.packList){ - if(pack!=undefined&&pack.scaned){ - detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + if(detail.packList.length>0){ + detail.handleQty = new Decimal(0).toNumber(); + for (let pack of detail.packList){ + if(pack!=undefined&&pack.scaned){ + detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + } } } item.handleQty = calc.add(item.handleQty, detail.handleQty); diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue index 10f12497..1f7d0408 100644 --- a/src/mycomponents/package/packageList.vue +++ b/src/mycomponents/package/packageList.vue @@ -117,7 +117,7 @@ res => { if (res) { item.scaned = false - item.handleQty = 0 + item.handleQty = null; this.$emit('updateData') this.$forceUpdate() } diff --git a/src/pages.json b/src/pages.json index 5f149645..ae981a2f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -472,6 +472,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/issue/request/issueScanRequest", + "style": { + "navigationBarTitleText": "扫描叫料申请", + "enablePullDownRefresh": false + } + }, { "path": "pages/issue/job/issueJob", diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue new file mode 100644 index 00000000..03247804 --- /dev/null +++ b/src/pages/issue/request/issueScanRequest.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 71aa0e8f..a711a661 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -311,6 +311,7 @@ }) calcTreeHandleQty(this.detailSource); + var test =this.detailSource this.continueScan() this.$forceUpdate() } @@ -409,17 +410,17 @@ var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - purchaseReceiptJobSubmit(params).then(res => { - uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) + // purchaseReceiptJobSubmit(params).then(res => { + // uni.hideLoading() + // if (res.data) { + // this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data) + // } else { + // this.showErrorMessage("提交失败[" + res.msg + "]") + // } + // }).catch(error => { + // uni.hideLoading() + // this.showErrorMessage(error) + // }) } else { uni.hideLoading(); this.showErrorMessage(res.message); From 04997d2d1e359a5e8633c59dd1a7398c18ff0b53 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 15 Mar 2024 11:15:52 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseReceipt/job/receiptDetail.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index a711a661..e54887bd 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -410,17 +410,17 @@ var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // purchaseReceiptJobSubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + purchaseReceiptJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } else { uni.hideLoading(); this.showErrorMessage(res.message); From eb44fa07b8323b1f87bad01e289d76a394e6a078 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 18 Mar 2024 09:02:59 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- src/api/request2.js | 67 +++ src/common/label.js | 23 +- src/mycomponents/scan/winComScan.vue | 5 +- src/mycomponents/scan/winScanJobNumber.vue | 8 +- src/pages.json | 38 ++ src/pages/count/record/countRecord.vue | 11 +- src/pages/issue/coms/jobInfoPopup.vue | 5 +- src/pages/issue/job/issueDetail.vue | 2 - src/pages/issue/job/issueJob.vue | 7 +- src/pages/issue/request/issueScanRequest.vue | 52 +- src/pages/package/coms/comOverPackJobCard.vue | 39 ++ .../package/coms/comOverPackJobDetailCard.vue | 188 +++++++ src/pages/package/job/overPackageJob.vue | 305 +++++++++++ .../package/job/overPackageJobDetail.vue | 518 ++++++++++++++++++ 15 files changed, 1224 insertions(+), 46 deletions(-) create mode 100644 src/pages/package/coms/comOverPackJobCard.vue create mode 100644 src/pages/package/coms/comOverPackJobDetailCard.vue create mode 100644 src/pages/package/job/overPackageJob.vue create mode 100644 src/pages/package/job/overPackageJobDetail.vue diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 8fec1895..8c453cd3 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -17,7 +17,7 @@ "type" : "uni-app:h5" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/src/api/request2.js b/src/api/request2.js index e68bdb0e..ac332ad9 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -3680,4 +3680,71 @@ export function getPackageUnitList(params) { method: "post", data: params, }); +} + +/** + * 翻包 任务承接 + * @param {*} id + * + */ +export function takeOverPageJob(id) { + return request({ + url: baseApi + "/wms/issue-job-main/accept?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 翻包 放弃承接 + * @param {*} id + * + */ +export function cancleTakeOverPageJob(id) { + return request({ + url: baseApi + "/wms/issue-job-main/abandon?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 翻包任务 列表 + * status 任务状态 + * 开始日期 + * 结束日期 + * 获取日期任务列表 + * @param {*} + */ +export function getOverPageJobList(params) { + return request({ + url: baseApi + "/wms/issue-job-main/senior", + method: "post", + data: params, + }); +} + +/** + * 翻包任务明细 + * @param {*} 任务id + * + */ +export function getOverPageJobDetail(id) { + return request({ + url: baseApi + "/wms/issue-job-main/getIssueJobById?id=" + id, + method: "get", + data: {}, + }); +} + +/** + * 翻包任务 提交 + * @param {*} params + */ +export function overPageSubmit(params) { + return request({ + url: baseApi + "/wms/issue-job-main/execute", + method: "put", + data: params, + }); } \ No newline at end of file diff --git a/src/common/label.js b/src/common/label.js index 06e3546a..03e65b84 100644 --- a/src/common/label.js +++ b/src/common/label.js @@ -49,17 +49,18 @@ export function getLabelInfo(scanMsg,headerType, callBack) { getBarCodeInfo('text', 'V1.0', scanMsg, callBack); } }else { - let labelResult = { - label: { - labelType: "", - barType: '', - code:"" - }, - package: null, - success: false, - message: '标签格式不正确', - } - callBack(labelResult); + getBarCodeInfo('text', 'V1.0', scanMsg, callBack); + // let labelResult = { + // label: { + // labelType: "", + // barType: '', + // code:"" + // }, + // package: null, + // success: false, + // message: '标签格式不正确', + // } + // callBack(labelResult); } } diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index f2727923..9a408e09 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -108,8 +108,8 @@ document.querySelector('textarea').setAttribute('inputmode', 'none') } // #endif - // #ifdef APP-PLUS this.hide() + // #ifdef APP-PLUS // // this.hide() // uni.onKeyboardHeightChange(res => { @@ -146,6 +146,7 @@ }, methods: { hide() { + // #ifdef APP-PLUS // 只是解决软键盘的闪现 var interval = setInterval(function() { uni.hideKeyboard(); //隐藏软键盘 @@ -155,6 +156,7 @@ clearInterval(interval); console.log('停止刷新') }, 1000); + // #endif }, getValue() { return this.scanMsg @@ -221,6 +223,7 @@ this.$nextTick(r => { that.boxfocus = true; }); + this.hide() }, losefocus() { let that = this; diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue index 9dbab854..96cfe6c7 100644 --- a/src/mycomponents/scan/winScanJobNumber.vue +++ b/src/mycomponents/scan/winScanJobNumber.vue @@ -13,7 +13,13 @@ - + diff --git a/src/pages.json b/src/pages.json index ae981a2f..81e36cbd 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1691,7 +1691,45 @@ "navigationBarTitleText": "翻包", "enablePullDownRefresh": false } + }, + + { + "path": "pages/package/job/overPackageJob", + "style": { + "navigationBarTitleText": "翻包任务", + "enablePullDownRefresh": false, + "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/package/job/overPackageJobDetail", + "style": { + "navigationBarTitleText": "翻包任务详情", + "enablePullDownRefresh": false + } } + + ], diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue index 3e500a09..3fe4cea1 100644 --- a/src/pages/count/record/countRecord.vue +++ b/src/pages/count/record/countRecord.vue @@ -38,7 +38,7 @@ - + @@ -74,6 +74,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" + import countQtyEdit from "@/mycomponents/qty/countQtyEdit.vue" export default { name: 'receipt_detail', @@ -85,7 +86,7 @@ comBlankView, winScanPackAndLocation, winScanLocation, - CountQtyEdit + countQtyEdit }, data() { return { @@ -265,7 +266,7 @@ this.$refs.comMessage.showSelectMessageModal("箱码【" + packingNumber + "】已经完成盘点,是否要编辑数量", res => { if (res) { - this.$refs.CountQtyEdit.openEditPopup(this.itemEditInfo, + this.$refs.countQtyEdit.openEditPopup(this.itemEditInfo, detail.subList); } else { this.scanPopupGetFocus(); @@ -276,7 +277,7 @@ this.itemEditInfo.packQty = result.package.packQty; this.itemEditInfo.packUnit = result.package.packUnit; this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo, result.balance); - this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo); + this.$refs.countQtyEdit.openEditPopupShowSeconds(this.itemEditInfo); this.calcHandleQty(); } } @@ -358,7 +359,7 @@ editItem(val) { var detail = this.detailSource.find(r => r.itemCode == val.itemCode); - this.$refs.CountQtyEdit.openEditPopup(val, + this.$refs.countQtyEdit.openEditPopup(val, detail.subList); }, diff --git a/src/pages/issue/coms/jobInfoPopup.vue b/src/pages/issue/coms/jobInfoPopup.vue index 89710769..f654d6b4 100644 --- a/src/pages/issue/coms/jobInfoPopup.vue +++ b/src/pages/issue/coms/jobInfoPopup.vue @@ -40,7 +40,10 @@ methods: { openPopup(val) { this.dataContent = val; - this.$refs.popup.open('bottom') + setTimeout(res=>{ + this.$refs.popup.open('bottom') + },100) + }, closePopup() { this.$refs.popup.close() diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 12f9c788..262b8162 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -73,7 +73,6 @@ import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' - import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import workStation from '@/mycomponents/workStation/workStation.vue' @@ -83,7 +82,6 @@ jobDetailPopup, winScanButton, comIssueDetailCard, - comIssueRequestInfo, comScanIssuePack, jobTop, workStation diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index d2873878..2f9cf8e7 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -1,16 +1,11 @@ diff --git a/src/pages/package/coms/comOverPackJobCard.vue b/src/pages/package/coms/comOverPackJobCard.vue new file mode 100644 index 00000000..9226463b --- /dev/null +++ b/src/pages/package/coms/comOverPackJobCard.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/pages/package/coms/comOverPackJobDetailCard.vue b/src/pages/package/coms/comOverPackJobDetailCard.vue new file mode 100644 index 00000000..ff0ba129 --- /dev/null +++ b/src/pages/package/coms/comOverPackJobDetailCard.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue new file mode 100644 index 00000000..5b13bdff --- /dev/null +++ b/src/pages/package/job/overPackageJob.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue new file mode 100644 index 00000000..a98e8dce --- /dev/null +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -0,0 +1,518 @@ + + + + + From 8c54221efaec96a64dd62285a81ffecf0a7245b4 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 19 Mar 2024 11:22:21 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 34 +- src/mycomponents/qty/compareQty.vue | 2 +- src/pages.json | 69 +++ src/pages/package/coms/comOverPackJobCard.vue | 3 - .../package/coms/comOverPackJobDetailCard.vue | 2 - src/pages/package/coms/comScanPackagePack.vue | 540 ++++++++++++++++++ .../package/job/overPackageJobDetail.vue | 126 ++-- src/pages/package/js/package.js | 114 ++++ .../package/record/overPackageRecord.vue | 101 +++- src/pages/pick/job/pickJob.vue | 287 ++++++++++ src/pages/pick/job/pickJobDetail.vue | 418 ++++++++++++++ .../productReceipt/job/completeReceiveJob.vue | 8 + .../job/completeReceiveJobDetail.vue | 8 + src/pages/setter/index.vue | 11 + src/static/config.js | 4 +- 15 files changed, 1655 insertions(+), 72 deletions(-) create mode 100644 src/pages/package/coms/comScanPackagePack.vue create mode 100644 src/pages/package/js/package.js create mode 100644 src/pages/pick/job/pickJob.vue create mode 100644 src/pages/pick/job/pickJobDetail.vue create mode 100644 src/pages/productReceipt/job/completeReceiveJob.vue create mode 100644 src/pages/productReceipt/job/completeReceiveJobDetail.vue diff --git a/src/api/request2.js b/src/api/request2.js index ac332ad9..02c07550 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -506,6 +506,24 @@ export function getProductionlineItem(params) { }); } +/** + * 通过物料查询包装规格 + * @param {*} itemCode + * + */ +export function getPackUnitByItemCode(itemCode) { + var params = { + itemCode: itemCode, + pageNo: 1, + pageSize: 100 + } + return request({ + url: baseApi + "/wms/itempackage/page", + method: "get", + data: params, + }); +} + /** * 查询生产线-车间-工位 * @param {*} @@ -3517,19 +3535,17 @@ export function mergePackageRecordSubmit(params) { } /** - * 翻包 提交 + * 翻包直接生成记录 提交 * @param {*} params */ export function overPackageRecordSubmit(params) { return request({ - url: baseApi + "/wms/packageover-main/create", + url: baseApi + "/wms/packageover-record-main/create", method: "post", data: params, }); } - - /** * "itemCodes": [], "locationCode":"INSPECT" @@ -3689,7 +3705,7 @@ export function getPackageUnitList(params) { */ export function takeOverPageJob(id) { return request({ - url: baseApi + "/wms/issue-job-main/accept?id=" + id, + url: baseApi + "/wms/packageover-job-main/accept?id=" + id, method: "put", data: {}, }); @@ -3702,7 +3718,7 @@ export function takeOverPageJob(id) { */ export function cancleTakeOverPageJob(id) { return request({ - url: baseApi + "/wms/issue-job-main/abandon?id=" + id, + url: baseApi + "/wms/packageover-job-main/abandon?id=" + id, method: "put", data: {}, }); @@ -3718,7 +3734,7 @@ export function cancleTakeOverPageJob(id) { */ export function getOverPageJobList(params) { return request({ - url: baseApi + "/wms/issue-job-main/senior", + url: baseApi + "/wms/packageover-job-main/senior", method: "post", data: params, }); @@ -3731,7 +3747,7 @@ export function getOverPageJobList(params) { */ export function getOverPageJobDetail(id) { return request({ - url: baseApi + "/wms/issue-job-main/getIssueJobById?id=" + id, + url: baseApi + "/wms/packageover-job-main/getPackageoverJobById?id=" + id, method: "get", data: {}, }); @@ -3743,7 +3759,7 @@ export function getOverPageJobDetail(id) { */ export function overPageSubmit(params) { return request({ - url: baseApi + "/wms/issue-job-main/execute", + url: baseApi + "/wms/packageover-job-main/execute", method: "put", data: params, }); diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue index c623f594..2f844585 100644 --- a/src/mycomponents/qty/compareQty.vue +++ b/src/mycomponents/qty/compareQty.vue @@ -67,7 +67,7 @@ dataContent: { type: Object, - default: {} + default: null }, recommendQty: { type: Number, diff --git a/src/pages.json b/src/pages.json index 81e36cbd..90c8c015 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1080,6 +1080,75 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/productReceipt/job/completeReceiveJob", + "style": { + "navigationBarTitleText": "完工收货任务", + "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/productReceipt/job/completeReceiveJobDetail", + "style": { + "navigationBarTitleText": "完工收货任务详情", + "enablePullDownRefresh": true + } + }, + + { + "path": "pages/pick/job/pickJob", + "style": { + "navigationBarTitleText": "直接备货任务", + "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/pick/job/pickJobDetail", + "style": { + "navigationBarTitleText": "直接备货任务详情", + "enablePullDownRefresh": true + } + }, { "path": "pages/scrap/record/scrapRecord", "style": { diff --git a/src/pages/package/coms/comOverPackJobCard.vue b/src/pages/package/coms/comOverPackJobCard.vue index 9226463b..41c577a8 100644 --- a/src/pages/package/coms/comOverPackJobCard.vue +++ b/src/pages/package/coms/comOverPackJobCard.vue @@ -4,9 +4,6 @@ 申请单号 {{dataContent.requestNumber}} - - 车间 {{dataContent.workShopCode}} - diff --git a/src/pages/package/coms/comOverPackJobDetailCard.vue b/src/pages/package/coms/comOverPackJobDetailCard.vue index ff0ba129..7cd7c1f1 100644 --- a/src/pages/package/coms/comOverPackJobDetailCard.vue +++ b/src/pages/package/coms/comOverPackJobDetailCard.vue @@ -69,7 +69,6 @@ import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue' import location from '@/mycomponents/balance/location.vue' import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue' - import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' import { getDetailOption, getEditRemoveOption, @@ -88,7 +87,6 @@ balanceQtyEdit, location, detailInfoPopup, - comIssueRequestInfo }, props: { dataContent: { diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue new file mode 100644 index 00000000..1e1997d2 --- /dev/null +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -0,0 +1,540 @@ + + + + + diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index a98e8dce..daf9aa03 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -11,10 +11,21 @@ - - + + + 原始包装规格 : {{subList[0].fromPackUnit}} + + + 原始标包数量 : {{subList[0].fromPackQty}} + + + 新包装规格 : {{subList[0].toPackUnit}} + + + 新标包数量 : {{subList[0].toPackQty}} + + + @@ -33,8 +44,8 @@ - - + + @@ -59,7 +70,7 @@ import { getDataSource - } from '@/pages/issue/js/issue.js'; + } from '@/pages/package/js/package.js'; import { getManagementPrecisions @@ -72,7 +83,7 @@ import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import comOverPackJobDetailCard from '@/pages/package/coms/comOverPackJobDetailCard.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' - import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' + import comScanPackagePack from '@/pages/package/coms/comScanPackagePack.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import workStation from '@/mycomponents/workStation/workStation.vue' @@ -82,7 +93,7 @@ jobDetailPopup, winScanButton, comOverPackJobDetailCard, - comScanIssuePack, + comScanPackagePack, jobTop, workStation }, @@ -243,10 +254,6 @@ // }, submit() { - uni.showLoading({ - title: "提交中....", - mask: true - }); //目前任务只到一个库位 var itemCodes = [] @@ -259,13 +266,13 @@ //使用在途库，不查询管理模式 if (this.jobContent.useOnTheWayLocation == 'TRUE') { - this.submitJob(); + this.checkSubmit(); } else { //获取管理模式，封装参数 getManagementPrecisions(itemCodes, locationCode, res => { if (res.success) { this.managementList = res.list; - this.submitJob(); + this.checkSubmit(); } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -273,11 +280,42 @@ }); } }, + checkSubmit(){ + var tempHandleQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].handleQty + var tempQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].qty + var toPackQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].toPackQty + if(tempHandleQty>tempQty){ + //大于需求数量 + this.showCommitMessage("实际数量【"+tempHandleQty+"】大于需求数量"+"【"+tempQty+"】, 是否提交?",tempHandleQty,toPackQty) + }else if (tempHandleQty0){ + var count= Math.ceil(tempHandleQty / toPackQty); + //发翻两包 + this.$refs.comMessage.showQuestionMessage("新标包数量是【"+toPackQty+"】,扫描数量【"+tempHandleQty+"】,将不能翻成【"+count+"】个整包,是否提交?", res => { + if (res) { + this.submitJob() + } + }); + + }else{ + this.submitJob() + } + }, submitJob() { + uni.showLoading({ + title: "提交中....", + mask: true + }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - overPageSubmit(params).then(res => { uni.hideLoading() if (res.data) { @@ -317,7 +355,7 @@ .ContainerNumber; record.toInventoryStatus = r .inventoryStatus; - record.toLocationCode = subItem + record.fromLocationCode = subItem .toLocationCode; record.supplierCode = r.supplierCode; @@ -328,25 +366,32 @@ record.singlePrice = single_price; record.amount = single_price * r.qty; + record.fromPackUnit = subItem.fromPackUnit; + record.toPackUnit = subItem.toPackUnit; + record.fromPackQty = subItem.fromPackQty; + record.toPackQty = subItem.toPackQty; + + record.toBatch = r.batch; + record.toPackingNumber = "" //使用在途库不改变管理模式 - if (this.jobContent - .useOnTheWayLocation == - 'TRUE') { - record.toPackingNumber = r - .packingNumber; - record.toBatch = r.batch; - } else { - var info = - getPackingNumberAndBatch( - this.managementList, r - .itemCode, - r.packingNumber, r - .batch); - record.toPackingNumber = info - .packingNumber; - record.toBatch = info.batch; - } + // if (this.jobContent + // .useOnTheWayLocation == + // 'TRUE') { + // record.toPackingNumber = r + // .packingNumber; + // record.toBatch = r.batch; + // } else { + // var info = + // getPackingNumberAndBatch( + // this.managementList, r + // .itemCode, + // r.packingNumber, r + // .batch); + // record.toPackingNumber = info + // .packingNumber; + // record.toBatch = info.batch; + // } subItem.recordList.push(record); }) subList.push(subItem); @@ -436,6 +481,13 @@ } }); }, + showCommitMessage(message,tempHandleQty,toPackQty) { + this.$refs.comMessage.showQuestionMessage(message, res => { + if (res) { + this.packageHint(tempHandleQty,toPackQty) + } + }); + }, showScanMessage(message) { this.$refs.comMessage.showScanMessage(message); @@ -459,10 +511,6 @@ this.scanPopupGetFocus(); }, - showScanMessage(message) { - this.$refs.comMessage.showScanMessage(message); - }, - closeScanMessage() { this.scanPopupGetFocus(); }, @@ -477,7 +525,7 @@ var datacontent = {} //克隆对象，深度克隆，防止双向绑定同一个变量 // Object.assign(datacontent, this.detailSource); - this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); + this.$refs.comScanPackagePack.openScanPopup(this.detailSource, this.jobContent); }, closeScanPopup() { this.updateCommitBtn(); diff --git a/src/pages/package/js/package.js b/src/pages/package/js/package.js new file mode 100644 index 00000000..f7766c48 --- /dev/null +++ b/src/pages/package/js/package.js @@ -0,0 +1,114 @@ + import { + calc + } from '@/common/calc.js'; +export function getDataSource(list, subList) { + for (var i = 0; i < subList.length; i++) { + let detail = subList[i]; + var location = list.find(r => + r.toLocationCode == detail.toLocationCode) + if (location == undefined) { + location = { + toLocationCode: detail.toLocationCode, + productionLineCode: detail.productionLineCode, + workStationCode: detail.workStationCode, + Items: [] + } + list.push(location); + } + createDetailInfo(location, detail); + } + return list; +} + +//树形结构:需求库位 -> 物料Items -> 库位 Locations-> 批次Batchs -> 记录Records +export function createDetailInfo(location, detail) { + var item = location.Items.find(r => + r.itemCode == detail.itemCode) + if (item == undefined) { + item = createItemInfo(detail); + location.Items.push(item) + } else { + item.qty = calc.add(item.qty,detail.qty) + //在物料下查找库位 + let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode); + if (location == undefined) { + location = createLocationInfo(detail); + item.Locations.push(location); + } else { + //在库位下查找批次 + let batch = location.Batchs.find(r => r.batch == detail.batch); + if (batch == undefined) { + let batch = createBatchInfo(detail); + location.Batchs.push(batch); + } else { + if (detail.packingNumber != "" && detail.packingNumber != null) { + batch.Recommends.push(detail); + } + } + } + } +} + +export function createItemInfo(detail) { + let item = { + itemCode: detail.itemCode, + itemName: detail.itemName, + productionLineCode: detail.productionLineCode, + workStationCode: detail.workStationCode, + stdPackQty: detail.stdPackQty, + packUnit: detail.packUnit, + qty: detail.qty, + uom: detail.uom, + handleQty: 0, + Locations: [] + } + let location = createLocationInfo(detail); + item.Locations.push(location); + return item; +} + +export function createLocationInfo(detail) { + let location = { + fromLocationCode: detail.fromLocationCode, + qty: detail.qty, + uom: detail.uom, + handleQty: 0, + Batchs: [] + } + let batch = createBatchInfo(detail); + location.Batchs.push(batch); + return location; +} + +export function createBatchInfo(detail) { + let batch = { + detail: detail, + batch: detail.batch, + packingNumber: detail.packingNumber, + qty: detail.qty, + uom: detail.uom, + handleQty: 0, + fromPackUnit:detail.fromPackUnit, + toPackUnit:detail.toPackUnit, + fromPackQty:detail.fromPackQty, + toPackQty:detail.toPackQty, + Recommends: [], + Records: [], + } + + //推荐到了箱码和批次 + if (detail.packingNumber != "" && detail.packingNumber != null) { + batch.Recommends.push(detail); + } + return batch; +} + +export function createRecordInfo(detail) { + var record = {} + detail.scaned = true; + // let record = JSON.parse(JSON.stringify(detail)); + //克隆对象，深度克隆，防止双向绑定同一个变量 + Object.assign(record, detail) + record.toLocationCode = this.toLocationCode; + return record; +} diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 475ed2ee..33e54e40 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -9,8 +9,16 @@ - + + 来源库位 : {{item.subList[0].locationCode}} + + 来源包装规格 : {{getPackUnitName(packUnit)}} + + + + @@ -22,6 +30,16 @@ + + 目标包装规格 : + + + {{toPackUnit}} + + + + @@ -38,11 +56,12 @@ :locationTypeList="fromlocationTypeList"> - + + + diff --git a/src/pages/pick/job/pickJobDetail.vue b/src/pages/pick/job/pickJobDetail.vue new file mode 100644 index 00000000..6759a483 --- /dev/null +++ b/src/pages/pick/job/pickJobDetail.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/pages/productReceipt/job/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue new file mode 100644 index 00000000..02409e35 --- /dev/null +++ b/src/pages/productReceipt/job/completeReceiveJob.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue new file mode 100644 index 00000000..02409e35 --- /dev/null +++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue index 9b616cfc..e5304ea6 100644 --- a/src/pages/setter/index.vue +++ b/src/pages/setter/index.vue @@ -88,6 +88,17 @@ plus.runtime.quit() // #endif + }).catch(error=>{ + clearStorage(); + // #ifdef H5 + uni.reLaunch({ + url: '../login/index' + }) + // #endif + + // #ifdef APP + plus.runtime.quit() + // #endif }) }; diff --git a/src/static/config.js b/src/static/config.js index 3f42814d..e9b53adc 100644 --- a/src/static/config.js +++ b/src/static/config.js @@ -1,5 +1,5 @@ -let request_url = "http://dev.ccwin-in.com:25300/api/admin-api" -// let request_url = "http://192.168.0.211:12080/admin-api" +// let request_url = "http://dev.ccwin-in.com:25300/api/admin-api" +let request_url = "http://192.168.0.128:12080/admin-api" let isDevelopment = true From c4450633fbf43615f35014413dc72086e70a1696 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 19 Mar 2024 15:53:22 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/directory.js | 42 ++++- src/common/record.js | 4 + src/mycomponents/scan/winScanLocation.vue | 19 +- src/pages/index/index.vue | 3 +- .../package/job/overPackageJobDetail.vue | 74 ++++---- .../package/record/overPackageRecord.vue | 165 +++++++++++------- 6 files changed, 197 insertions(+), 110 deletions(-) diff --git a/src/common/directory.js b/src/common/directory.js index c72deb20..5eae6dcb 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -19,6 +19,8 @@ let inspectTypeList = []; let sampleMethodList = []; let transferModeList = []; let countStageList = []; +let locationAreaTypeList = []; + // 获取业务类型字典项 @@ -57,6 +59,7 @@ export function clearCacheData() { sampleMethodList = []; transferModeList = []; countStageList = []; + locationAreaTypeList=[] } //获取字典信息 @@ -144,6 +147,16 @@ export function getJobStateStyle(value) { } } +//获取库区描述（多个库区） +export function getListLocationAreaTypeDesc(list) { + let desc = ''; + list.forEach(res => { + desc += getLocationAreaTypeInfo(res).label + "," + }) + desc = desc.slice(0, -1); + return desc; +} + //获取库位描述（多个库位） export function getListLocationTypeDesc(list) { let desc = ''; @@ -212,6 +225,23 @@ export function getItemStateInfo(value) { return resultInfo } +//获取库区类型 +export function getLocationAreaTypeInfo(value) { + var resultInfo = ""; + if (locationAreaTypeList.length == 0) { + locationAreaTypeList = getDirectoryInfo("area_type") + } + if (locationAreaTypeList.length > 0) { + for (let item of locationAreaTypeList) { + if (item.value == value) { + resultInfo = item + break; + } + } + } + return resultInfo +} + //获取库位类型 export function getLocationTypeInfo(value) { var resultInfo = ""; @@ -228,6 +258,13 @@ export function getLocationTypeInfo(value) { } return resultInfo } +//获取库区类型名称 +export function getLocationAreaTypeName(value) { + let location = getLocationAreaTypeInfo(value); + + return location == '' ? value : location.label; +} + //获取库位类型名称 export function getLocationTypeName(value) { @@ -529,4 +566,7 @@ export function getPackUnitName(value) { } } return resultInfo -} \ No newline at end of file +} + + +locationAreaTypeList \ No newline at end of file diff --git a/src/common/record.js b/src/common/record.js index 09bff6d6..cf6763c6 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -79,6 +79,8 @@ export function getBusinessType(typeCode, callback) { success: true, businessType: '', fromlocationTypeList: '', + fromLocationAreaTypeList:'', + toAreaTypes:'', tolocationTypeList: '', itemCodeTypeList:"", useOnTheWay:"FALSE", @@ -89,6 +91,8 @@ export function getBusinessType(typeCode, callback) { getBusinesstypeByCode(typeCode).then(res => { if (res.data.total > 0) { result.businessType = res.data.list[0]; + result.fromLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].outAreaTypes) ; + result.toLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].inAreaTypes) ; result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes) result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes) result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes) diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 8f40ed87..95b191c2 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -27,8 +27,8 @@ getBasicLocationByCode, } from '@/api/request2.js'; import { - getLocationTypeName, - getListLocationTypeDesc, + getLocationAreaTypeName, + getListLocationAreaTypeDesc, checkDirectoryItemExist } from '@/common/directory.js'; import winComScan from '@/mycomponents/scan/winComScan.vue' @@ -44,7 +44,7 @@ }, locationTypeList: { type: Array, - default: [] + default: null }, isShowHistory: { type: Boolean, @@ -98,15 +98,22 @@ if (res.data.total > 0) { let result = res.data.list[0]; var type = result.type; + var areaType = "" + if(this.code=="RAW"){ + areaType="RAW" + }else { + areaType="SUPPER" + } + var available = result.available; if (available == "TRUE") { - if (checkDirectoryItemExist(this.locationTypeList, type)) { + if (checkDirectoryItemExist(this.locationTypeList, areaType)) { this.location = result; this.callBack(); } else { - var hint = getListLocationTypeDesc(this.locationTypeList); + var hint = getListLocationAreaTypeDesc(this.locationTypeList); this.showErrorMessage("扫描库位[" + this.code + "]是[" + - getLocationTypeName(type) + "],需要的库位类型是[" + hint + "]") + getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]") } } else { this.showErrorMessage("扫描库位[" + this.code + "]不可用") diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 3ae14fe0..45cad563 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -93,7 +93,6 @@ forcedLogin: false, count: 1, position: [-10, -10], - timer: null, menusCount: {}, filterList: [], serchval: "" @@ -337,7 +336,7 @@ "inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason", "unplanned_issue_reason", "scrap_reason", "inspect_failed_reason", "request_status", "inspect_type", "next_action", "sample_method", "transfer_mode", - "count_stage", "inspect_result" + "count_stage", "inspect_result","area_type" ] } getDictionaryItem(params).then(res => { diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index daf9aa03..8039ea93 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -25,13 +25,14 @@ 新标包数量 : {{subList[0].toPackQty}} - - + + - + @@ -75,7 +76,7 @@ import { getManagementPrecisions } from '@/common/balance.js'; - + import { calc } from '@/common/calc.js'; @@ -105,7 +106,7 @@ detailSource: [], //绑定在页面上的数据源 detailOptions: [], scanOptions: [], - jobStatus:"" + jobStatus: "" }; }, @@ -137,7 +138,7 @@ onBackPress(e) { //已经接收但是没提交任务 if (e.from === 'backbutton') { - if (this.jobStatus=="2") { + if (this.jobStatus == "2") { //取消承接任务 cancleTakeOverPageJob(this.id).then(res => { uni.navigateBack(); @@ -147,10 +148,10 @@ } else { uni.navigateBack(); } - + return true; } - + }, watch: { @@ -280,31 +281,32 @@ }); } }, - checkSubmit(){ + checkSubmit() { var tempHandleQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].handleQty var tempQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].qty var toPackQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].toPackQty - if(tempHandleQty>tempQty){ + if (tempHandleQty > tempQty) { //大于需求数量 - this.showCommitMessage("实际数量【"+tempHandleQty+"】大于需求数量"+"【"+tempQty+"】, 是否提交?",tempHandleQty,toPackQty) - }else if (tempHandleQty0){ - var count= Math.ceil(tempHandleQty / toPackQty); - //发翻两包 - this.$refs.comMessage.showQuestionMessage("新标包数量是【"+toPackQty+"】,扫描数量【"+tempHandleQty+"】,将不能翻成【"+count+"】个整包,是否提交?", res => { - if (res) { - this.submitJob() - } - }); - - }else{ + if (tempHandleQty % toPackQty > 0) { + this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty + + "】,将有1个非整包,是否提交?", res => { + if (res) { + this.submitJob() + } + }); + + } else { this.submitJob() } }, @@ -321,7 +323,7 @@ if (res.data) { this.showCommitSuccessMessage("提交成功
生成发料记录
" + res.data) } else { - this.showErrorMessage("提交失败[" + res.msg+"]") + this.showErrorMessage("提交失败[" + res.msg + "]") } }).catch(error => { uni.hideLoading() @@ -366,11 +368,13 @@ record.singlePrice = single_price; record.amount = single_price * r.qty; - record.fromPackUnit = subItem.fromPackUnit; + record.fromPackUnit = subItem + .fromPackUnit; record.toPackUnit = subItem.toPackUnit; - record.fromPackQty = subItem.fromPackQty; + record.fromPackQty = subItem + .fromPackQty; record.toPackQty = subItem.toPackQty; - + record.toBatch = r.batch; record.toPackingNumber = "" @@ -450,10 +454,10 @@ let handleQty = 0; if (batch != undefined) { batch.Records.forEach(res => { - handleQty = calc.add(handleQty,res.qty) + handleQty = calc.add(handleQty, res.qty) }) batch.handleQty = handleQty; - itemHandleQty = calc.add(itemHandleQty,handleQty) + itemHandleQty = calc.add(itemHandleQty, handleQty) } }) } @@ -481,10 +485,10 @@ } }); }, - showCommitMessage(message,tempHandleQty,toPackQty) { + showCommitMessage(message, tempHandleQty, toPackQty) { this.$refs.comMessage.showQuestionMessage(message, res => { if (res) { - this.packageHint(tempHandleQty,toPackQty) + this.packageHint(tempHandleQty, toPackQty) } }); }, @@ -563,4 +567,4 @@ // border-bottom-width: 1px; // border-bottom-color: #ebeef5; // } - + \ No newline at end of file diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 33e54e40..88c4977c 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -9,11 +9,13 @@ - + 来源库位 : {{item.subList[0].locationCode}} - 来源包装规格 : {{getPackUnitName(packUnit)}} + 来源包装规格 : + {{fromPackUnit}}/{{item.subList[0].packQty}}{{getUomInfo(item.subList[0].uom)}} + - + 目标包装规格 : - {{toPackUnit}} + {{toPackUnitShow}} + @confirm="confirmSelect"> + + - + @@ -53,10 +57,10 @@ + :locationTypeList="fromLocationAreaTypeList"> - + - - diff --git a/src/pages/productReceipt/job/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue index 02409e35..f5a4bad9 100644 --- a/src/pages/productReceipt/job/completeReceiveJob.vue +++ b/src/pages/productReceipt/job/completeReceiveJob.vue @@ -1,8 +1,288 @@ - \ No newline at end of file + diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue index 02409e35..1b3fb8fa 100644 --- a/src/pages/productReceipt/job/completeReceiveJobDetail.vue +++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue @@ -1,8 +1,418 @@ - \ No newline at end of file + diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index c5e524a7..c047a1ba 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("制品收货(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("制品收货(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index f231f6af..6a28d995 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -60,7 +60,6 @@ } from '@/api/request2.js'; import { goHome, - updateTitle, navigateBack, getCurrDateTime, getPackingNumberAndBatch, @@ -183,7 +182,6 @@ that.jobToLocationCode = that.subList[0].toLocationCode that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) - // updateTitle(this.jobContent.number); } else { that.showMessage('列表数据为0'); } diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index f5ed5c5f..d0265058 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("生产收料(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -163,7 +164,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("生产收料(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue index f22e12d1..0a88f667 100644 --- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue +++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue @@ -183,6 +183,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle(this.title + "(" + this.totalCount + ")") this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -195,7 +196,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle(this.title + "(" + this.totalCount + ")") + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue index 9e79f81f..b9ed5645 100644 --- a/src/pages/productionReturn/job/returnJob.vue +++ b/src/pages/productionReturn/job/returnJob.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("生产退料(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -163,12 +164,13 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("生产退料(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); } + updateTitle("生产退料"); this.loadingType = ""; uni.hideLoading(); that.showMessage(error) diff --git a/src/pages/productionReturn/request/returnToHoldRequest.vue b/src/pages/productionReturn/request/returnToHoldRequest.vue index 47463dac..05d247b9 100644 --- a/src/pages/productionReturn/request/returnToHoldRequest.vue +++ b/src/pages/productionReturn/request/returnToHoldRequest.vue @@ -10,7 +10,6 @@ import { goHome, - updateTitle } from '@/common/basic.js'; export default { diff --git a/src/pages/productionReturn/request/returnToStoreRequest.vue b/src/pages/productionReturn/request/returnToStoreRequest.vue index 2bcde74f..834e6d80 100644 --- a/src/pages/productionReturn/request/returnToStoreRequest.vue +++ b/src/pages/productionReturn/request/returnToStoreRequest.vue @@ -10,7 +10,6 @@ import { goHome, - updateTitle } from '@/common/basic.js'; export default { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 99cc4624..4b31684e 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -65,7 +65,6 @@ goHome, getCurrDateTime, getPackingNumberAndBatch, - updateTitle, compareAsc, navigateBack } from '@/common/basic.js'; @@ -207,7 +206,6 @@ } else { that.showMessage('列表数据为0'); } - // updateTitle("采购收货-" + that.jobContent.number); } }).catch(error => { uni.hideLoading() diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 0c720e25..01c9337a 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -151,6 +151,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购收货(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -158,7 +159,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("采购收货(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue index 3e0fec94..64341730 100644 --- a/src/pages/purchaseReturn/job/returnJob.vue +++ b/src/pages/purchaseReturn/job/returnJob.vue @@ -153,6 +153,7 @@ } var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购退货(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -160,7 +161,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("采购退货(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/purchaseReturn/request/returnRequest.vue b/src/pages/purchaseReturn/request/returnRequest.vue index 710dc473..04057066 100644 --- a/src/pages/purchaseReturn/request/returnRequest.vue +++ b/src/pages/purchaseReturn/request/returnRequest.vue @@ -157,6 +157,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购退货申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -168,7 +169,7 @@ }) this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("采购退货申请(" + this.totalCount + ")"); + }).catch(error => { uni.hideLoading(); diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue index cea6503c..09e369f8 100644 --- a/src/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue @@ -44,7 +44,6 @@ } from '@/api/request2.js'; import { goHome, - updateTitle, navigateBack, deepCopyData, getCurrDateOneMonthsTimes diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 6a3069ff..14d8f9e2 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购上架(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("采购上架(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 015deabf..13bb04fc 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -57,7 +57,6 @@ import { goHome, - updateTitle, getCurrDateTime, getPackingNumberAndBatchByList, deepCopyData @@ -123,7 +122,7 @@ }; }, onLoad(option) { - this.clear(); + this.clearData(); var typeCode = "PurchasePutaway" getBusinessType(typeCode, res => { if (res.success) { @@ -443,7 +442,7 @@ showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { - this.clear(); + this.clearData(); }) }, @@ -457,7 +456,7 @@ } }, - clear() { + clearData() { this.fromLocationInfo = {}; this.fromLocationCode = ''; this.fromWarehouseCode = ''; diff --git a/src/pages/putaway/request/putawayRequest.vue b/src/pages/putaway/request/putawayRequest.vue index af160389..9406c847 100644 --- a/src/pages/putaway/request/putawayRequest.vue +++ b/src/pages/putaway/request/putawayRequest.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购上架申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -168,7 +169,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("采购上架申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue index 0d3b1789..bf8774a9 100644 --- a/src/pages/putaway/request/putawayRequestCreate.vue +++ b/src/pages/putaway/request/putawayRequestCreate.vue @@ -58,7 +58,6 @@ import { goHome, - updateTitle, getCurrDateTime, deepCopyData, getPackingNumberAndBatchByList diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 3a65959b..cf33ab4c 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -51,7 +51,6 @@ import { goHome, - updateTitle, navigateBack, getRemoveOption, getCurrDateTime, diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index b5084a2c..90eebc7e 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("补料(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("补料(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index 8d8404de..80c68b2a 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -55,7 +55,6 @@ import { goHome, - updateTitle, getCurrDateTime, getPackingNumberAndBatch } from '@/common/basic.js'; diff --git a/src/pages/repleinsh/request/repleinshRequest.vue b/src/pages/repleinsh/request/repleinshRequest.vue index 37de925d..7294fa45 100644 --- a/src/pages/repleinsh/request/repleinshRequest.vue +++ b/src/pages/repleinsh/request/repleinshRequest.vue @@ -137,6 +137,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("采购上架申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -149,7 +150,7 @@ this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("采购上架申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue index 76485468..cde67343 100644 --- a/src/pages/scrap/job/scrapJob.vue +++ b/src/pages/scrap/job/scrapJob.vue @@ -150,6 +150,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("报废出库(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -157,7 +158,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("报废出库(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue index b5879d33..0c35c693 100644 --- a/src/pages/scrap/record/scrapRecord.vue +++ b/src/pages/scrap/record/scrapRecord.vue @@ -1,9 +1,9 @@ \ No newline at end of file + diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue new file mode 100644 index 00000000..6c5cd4e2 --- /dev/null +++ b/src/pages/stockUp/job/stockUpJobDetail.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue index 16313ac0..333ec1e5 100644 --- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue +++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue @@ -142,6 +142,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("供应商发货记录(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -149,7 +150,7 @@ } this.recordList = type === "refresh" ? list : this.recordList.concat(list); this.pageNo++; - updateTitle("供应商发货记录(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index 674c191b..cb4660b7 100644 --- a/src/pages/transfer/job/issueJob.vue +++ b/src/pages/transfer/job/issueJob.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("调拨出库任务(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -163,7 +164,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("调拨出库任务(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index 87c65a88..9e4d7d6f 100644 --- a/src/pages/transfer/job/receiptJob.vue +++ b/src/pages/transfer/job/receiptJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("调拨入库任务(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("调拨入库任务(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index c5ef37ff..8655c4d8 100644 --- a/src/pages/unPlanned/job/issueJob.vue +++ b/src/pages/unPlanned/job/issueJob.vue @@ -158,6 +158,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外出库(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -165,7 +166,6 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("计划外出库(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 9a9b713d..dafe8b88 100644 --- a/src/pages/unPlanned/job/receiptJob.vue +++ b/src/pages/unPlanned/job/receiptJob.vue @@ -145,6 +145,7 @@ } var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外入库(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -152,7 +153,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("计划外入库(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue index de9faeb0..5b963c07 100644 --- a/src/pages/unPlanned/record/issueRecord.vue +++ b/src/pages/unPlanned/record/issueRecord.vue @@ -69,7 +69,6 @@ import { goHome, - updateTitle, deepCopyData } from '@/common/basic.js'; diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue index b306fc69..cc6e8f6e 100644 --- a/src/pages/unPlanned/record/receiptRecord.vue +++ b/src/pages/unPlanned/record/receiptRecord.vue @@ -72,7 +72,6 @@ } from 'decimal.js'; //引入 import { goHome, - updateTitle, deepCopyData, getPackingNumberAndBatchByList } from '@/common/basic.js'; diff --git a/src/pages/unPlanned/request/issueRequest.vue b/src/pages/unPlanned/request/issueRequest.vue index 03357c79..4e04af98 100644 --- a/src/pages/unPlanned/request/issueRequest.vue +++ b/src/pages/unPlanned/request/issueRequest.vue @@ -159,6 +159,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外出库申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -171,7 +172,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("计划外出库申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue index af297c18..b85ed4f2 100644 --- a/src/pages/unPlanned/request/issueRequestCreate.vue +++ b/src/pages/unPlanned/request/issueRequestCreate.vue @@ -75,7 +75,6 @@ import { goHome, - updateTitle, deepCopyData, getCurrDateTimes, getCurrDateOneMonthsTimes, diff --git a/src/pages/unPlanned/request/receiptRequest.vue b/src/pages/unPlanned/request/receiptRequest.vue index 5cdfb5ff..27f73e0e 100644 --- a/src/pages/unPlanned/request/receiptRequest.vue +++ b/src/pages/unPlanned/request/receiptRequest.vue @@ -157,6 +157,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外入库申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -168,7 +169,7 @@ }) this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("计划外入库申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/request/receiptRequestCreate.vue b/src/pages/unPlanned/request/receiptRequestCreate.vue index 5fbcc64a..0a3aaba4 100644 --- a/src/pages/unPlanned/request/receiptRequestCreate.vue +++ b/src/pages/unPlanned/request/receiptRequestCreate.vue @@ -56,7 +56,6 @@ import { goHome, - updateTitle, getRemoveOption, getISODateTime, navigateBack, diff --git a/src/static/config.js b/src/static/config.js index e9b53adc..a6ee2092 100644 --- a/src/static/config.js +++ b/src/static/config.js @@ -1,5 +1,5 @@ -// let request_url = "http://dev.ccwin-in.com:25300/api/admin-api" -let request_url = "http://192.168.0.128:12080/admin-api" +let request_url = "http://dev.ccwin-in.com:25300/api/admin-api" +// let request_url = "http://192.168.0.113:12080/admin-api" let isDevelopment = true From e83e6a4512945fda6c49a6331cb1afa5ba71e18f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 21 Mar 2024 11:21:55 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/purchaseReceipt/job/receiptDetail.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 4b31684e..ef951402 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -203,6 +203,7 @@ that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getTreeDataSource(that.subList) + that.isAllReceived = false; } else { that.showMessage('列表数据为0'); } @@ -496,13 +497,26 @@ detail.handleQty = detail.qty; detail.toLocationCode = this.toLocationCode; detail.labelQty = detail.qty; + detail.packList.forEach(pack=>{ + pack.scaned = true; + pack.handleQty = Number(pack.qty); + pack.toLocationCode = this.toLocationCode; + }) }) }) console.log(JSON.stringify(this.detailSource)) calcHandleQty(this.detailSource); } else { - this.getDetail() + this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { + if (res) { + + this.getDetail() + }else { + this.isAllReceived = true; + } + }); + } }, From 4f173f179d44a04fe9cb6b78d4023459582a59cb Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 22 Mar 2024 13:11:05 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 2 +- src/pages/productionReturn/record/returnToStore.vue | 4 ++-- src/pages/putaway/record/putawayRecord.vue | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index de9c0af9..b4cce1fa 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -441,7 +441,7 @@ export function validateItemAndLocation(parmas) { export function getPutawayRecommendLocation(params) { return request({ - url: baseApi + "/wms/location/recommendLocation", + url: baseApi + "/wms/location/recommendLocationNew", method: "post", data: params, }); diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue index 96a07773..cf5596ec 100644 --- a/src/pages/productionReturn/record/returnToStore.vue +++ b/src/pages/productionReturn/record/returnToStore.vue @@ -227,7 +227,6 @@ }) } else { - debugger var detail = item.subList.find(r => { if (r.packingNumber == label.packingNumber && r.batch == label.batch) { @@ -325,7 +324,8 @@ itemCode: label.itemCode, batch: label.batch, inventoryStatus: label.inventoryStatus, - supplierCode: pack.supplierCode + supplierCode: pack.supplierCode, + businessCode:this.businessTypeCode }; console.log(JSON.stringify(param)) getPutawayRecommendLocation(param).then(res => { diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index 13bb04fc..581efa96 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -118,13 +118,13 @@ businessType: {}, showToLoaction: true, recommendLocationList: [], //推荐库位列表 - fromWarehouseCode: '' //来源仓库 + fromWarehouseCode: '' ,//来源仓库 + businessTypeCode:"PurchasePutaway" }; }, onLoad(option) { this.clearData(); - var typeCode = "PurchasePutaway" - getBusinessType(typeCode, res => { + getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; @@ -206,7 +206,8 @@ itemCode: balance.itemCode, batch: balance.batch, inventoryStatus: balance.inventoryStatus, - supplierCode: pack.supplierCode + supplierCode: pack.supplierCode, + businessCode:this.businessTypeCode }; console.log(JSON.stringify(param)) getPutawayRecommendLocation(param).then(res => {