From 340f99514cfcf357e2800390d6aab0bd3a5ff4f6 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 16 Aug 2024 15:50:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E7=A7=BB?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveRecord.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 161473dc..2860bdeb 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -391,9 +391,10 @@ var params = this.setParams() let hint="" this.dataContent.subList.forEach(res=>{ - if(res.fromLocationCode==res.toLocationCode&& - res.fromInventoryStatus==res.toInventoryStatus){ - hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + if(res.fromLocationCode==res.toLocationCode){ + if(res.fromInventoryStatus==res.toInventoryStatus){ + hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + } } }) if(hint){ From b3cc6cf0e85336bc06686b53366ae68b4920f8f5 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 16 Aug 2024 16:36:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/record.js | 2 +- .../inventoryMove/coms/comMoveRecord.vue | 42 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/common/record.js b/src/common/record.js index c13c1471..d744772f 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -39,7 +39,7 @@ export function createDetailInfo(balance, pack) { let detail = deepCopyData(balance); detail.balanceQty = new Decimal(detail.qty).toNumber() detail.qty = new Decimal(detail.qty).toNumber(); - detail.packQty = new Decimal(pack.packQty).toNumber() + detail.packQty = pack.packQty?new Decimal(pack.packQty).toNumber():0 detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber(); detail.package = pack; diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 2860bdeb..9cdc562b 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -49,7 +49,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" - + import { getInventoryStatusName } from '@/common/directory.js'; @@ -282,7 +282,7 @@ } else { newDetail.toInventoryStatus = this.toInventoryStatus; } - + if (newDetail.packingNumber == '') { newDetail.packingNumber = pack.number; } @@ -290,17 +290,17 @@ newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail); } else { - this.showErrorMessage("包装["+detail.packingNumber+"]\n"+ - "批次["+detail.batch+"]\n"+"库位["+detail.fromLocationCode+"]\n"+ - "库存状态["+getInventoryStatusName(detail.toInventoryStatus)+"]\n" - + "重复扫描") + this.showErrorMessage("包装[" + detail.packingNumber + "]\n" + + "批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" + + "库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" + + "重复扫描") } } calcHandleQty(this.detailSource); }, showErrorMessage(message) { - if(this.$refs.scanPopup){ + if (this.$refs.scanPopup) { this.$refs.scanPopup.packLoseFocus() } this.$refs.comMessage.showErrorMessage(message, res => { @@ -359,7 +359,7 @@ // this.showErrorMessage("来源库位和目标库位不能一致") // return; // } - + if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { //查询管理模式 uni.showLoading({ @@ -372,7 +372,7 @@ getPrecisionStrategyList(precisionStrategParams, res => { if (res.success) { this.managementList = res.list; - this.submit() + this.submit() } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -385,23 +385,23 @@ } }, - - submit(){ + + submit() { //目标库位和状态都一致时不可以提交 var params = this.setParams() - let hint="" - this.dataContent.subList.forEach(res=>{ - if(res.fromLocationCode==res.toLocationCode){ - if(res.fromInventoryStatus==res.toInventoryStatus){ - hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + let hint = "" + this.dataContent.subList.forEach(res => { + if (res.fromLocationCode == res.toLocationCode) { + if (res.fromInventoryStatus == res.toInventoryStatus) { + var resultHint = res.fromPackingNumber?`包装号【${res.fromPackingNumber}】`:"" + hint += resultHint+`来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` } } }) - if(hint){ + if (hint) { uni.hideLoading() this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => { - if (res) { - } + if (res) {} }); return; } @@ -425,9 +425,7 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - if (detail.toLocationCode == '') { - detail.toLocationCode = this.toLocationCode; - } + detail.toLocationCode = this.toLocationCode; var filterResult = itemList.filter(res => { if (res.itemCode == item.itemCode && detail.toLocationCode == res.locationCode) { From 1a1c9874a2ec23af3ee67deb31c6c5f786a5ef73 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 16 Aug 2024 17:00:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA=E5=8F=98=E6=B7=BB=E5=8A=A0=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E5=92=8C=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E9=98=B6=E6=AE=B5=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pointPutawayJob/index.vue | 200 +++++++++++++--------------- 1 file changed, 89 insertions(+), 111 deletions(-) diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index dab39818..baefd393 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -5,10 +5,11 @@ 检验指引单 上架指引单 - + - - Q + + Q @@ -35,8 +36,14 @@ - - + + + + + + + +
抽检数量 {{item.sampleQty}}
未生成检验申请
未生成检验申请
没有检验方案
检验阶段不存在
@@ -123,7 +130,7 @@ currentPage1: 1, pageSize1: 20, number: '', - isHaveOn: false,//显示上架指引单 + isHaveOn: false, //显示上架指引单 // isHaveInspect:false,//显示检验指引单 } }, @@ -201,83 +208,52 @@ this.readFile(htmlFileUrl1, (htmlContent) => { this.newHtmlContent1 = htmlContent this.data1.inspectDTOList.forEach(item => { - if(!item.haveInspectionRequest){ - str += ` -

-
-
Q
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
未生成检验申请
-
-
- ` - }else{ - str += ` -

-
-
Q
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
-
-
- ` + let str1 = ` +

+
+
Q
+ + + + + + + + + + + + + + + + + + + + + + + + + + + ` + let str2 = `` + if(item.haveInspectionRequest==='0'){ + str2 =`` + }else if(item.haveInspectionRequest==='2'){ + str2 =`` + }else if(item.haveInspectionRequest==='3'){ + str2 =`` } - + let str3 = ` + +
物料代码:${item.itemCode}
物料名称${item.itemName}发货单号${this.data1.asnNumber}
供应商${item.supplierCode}供应商批次${item.supplierBatch}
到货数量${item.quantityQty}抽检数量${item.sampleQty}
未生成检验申请
没有检验方案
检验阶段不存在
+
+
+ ` + str += str1 + str2+ str3 }) this.newHtmlContent1 = this.newHtmlContent1.replace( "mainBody", str); //替换物品代码 @@ -318,7 +294,7 @@ showMessage(message) { this.$refs.comMessage.showMessage(message, res => { if (res) { - + } }); }, @@ -346,7 +322,7 @@ }, async onShow() { // 获取上架指引单 - if(this.data.ids){ + if (this.data.ids) { await getJimuPutawayJobDetail({ masterIds: this.data.ids }).then(res => { @@ -355,27 +331,26 @@ }) } // 获取采购收货指引单 - if(this.number){ + if (this.number) { await queryInspectionFreeFlag({ - number: this.number - }).then(async res1 => { - console.log(444,res1) - this.data1 = res1.data - this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0) - if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){ - this.tabIndex =2 - } - this.getTableInspectDTOList() - }) - .catch(error=>{ - this.$refs.comMessage.showMessage(error, res => { - if (res) { - + number: this.number + }).then(async res1 => { + this.data1 = res1.data + this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty >0) + if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) { + this.tabIndex = 2 } - }); - }) + this.getTableInspectDTOList() + }) + .catch(error => { + this.$refs.comMessage.showMessage(error, res => { + if (res) { + + } + }); + }) } - + this.getPointPutawayJobHtml() this.getPurchaseReceiptJobHtml() }, @@ -531,11 +506,13 @@ td { padding: 10px; - &:nth-child(2n){ - width:290rpx; + + &:nth-child(2n) { + width: 290rpx; } - &:nth-child(2n+1){ - width:160rpx; + + &:nth-child(2n+1) { + width: 160rpx; } } @@ -563,17 +540,18 @@ border-bottom: 4rpx solid rgb(60, 156, 255); } } - .relative{ + + .relative { margin-bottom: 20rpx; position: relative; } - - .q{ + + .q { position: absolute; left: 50%; - top:50%; + top: 50%; font-size: 400rpx; - transform: translate(-50% ,-50%); + transform: translate(-50%, -50%); color: rgba(0, 0, 0, 0.1); } \ No newline at end of file From 3aef9849c99ad5ddd251aa179a0002d9cb62dbcc Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 16 Aug 2024 17:58:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0directIssue0816?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/record.js | 2 +- src/pages.json | 28 + src/pages/issue/record/directIssue0816.vue | 611 +++++++++++++++++++++ 3 files changed, 640 insertions(+), 1 deletion(-) create mode 100644 src/pages/issue/record/directIssue0816.vue diff --git a/src/common/record.js b/src/common/record.js index c13c1471..1ff0b5a3 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -28,7 +28,7 @@ export function createItemInfo(balance, pack) { // packingNumber: pack.number, // parentPackingNumber: pack.parentNumber, } - item.containerNumber = pack.parentNumber != null ? pack.parentNumber : pack.number; + item.containerNumber = pack.parentNumber ? pack.parentNumber : pack.number; return item; } diff --git a/src/pages.json b/src/pages.json index 33a6771c..65cde9c4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -628,6 +628,34 @@ } } }, + { + "path": "pages/issue/record/directIssue0816", + "style": { + "navigationBarTitleText": "直接发料0816", + "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/productionReceipt/job/productionReceiptJob", "style": { diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue new file mode 100644 index 00000000..8efa0038 --- /dev/null +++ b/src/pages/issue/record/directIssue0816.vue @@ -0,0 +1,611 @@ + + + + + \ No newline at end of file From ff475dc9205ba08992a202f27c38c5b2c206a533 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 18:27:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?HL-5376=20=E8=81=82=E5=96=9C=E5=A9=B7=2008-?= =?UTF-8?q?16=EF=BC=9A@=E7=8E=8B=E5=AE=87=E9=A3=9E=20=E6=B2=A1=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=97=B6=E7=BB=99=E5=87=BA?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=B7=E9=80=89=E6=8B=A9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/directIssue.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 02938feb..ec0e2955 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -390,6 +390,11 @@ // }, commit() { + if(this.positionInfo=='请选择生产线'||!this.positionInfo){ + this.showErrorMessage("请选择生产线") + return + } + uni.showLoading({ title: "提交中....", mask: true