diff --git a/src/manifest.json b/src/manifest.json index 34d1878c..12128319 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.75", - "versionCode" : 75, + "versionName" : "1.0.76", + "versionCode" : 76, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 4085bd11..ebf1416c 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -178,8 +178,8 @@ filters: filters, pageNo: this.pageNo, pageSize: this.pageSize, - sort:"number", - by:"DESC" + sort:"count_split_code", + by:"ASC" } getCountJobList(params).then(res => { diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index d57b2975..e74d0ed6 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -478,7 +478,10 @@ commit() { this.calcAllCount() this.calcScanCount() - + if(!this.scanCount){ + this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交'); + return + } if (this.scanCount == this.allCount) { this.submitJob(); } else if (this.scanCount < this.allCount) { diff --git a/src/pages/customerReturn/record/recordListDetail.vue b/src/pages/customerReturn/record/recordListDetail.vue index f9711e93..58584d3c 100644 --- a/src/pages/customerReturn/record/recordListDetail.vue +++ b/src/pages/customerReturn/record/recordListDetail.vue @@ -178,6 +178,8 @@ //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { this.receiveDisable = false; + }else { + this.receiveDisable = true; } }, @@ -193,6 +195,7 @@ updateData() { this.calcHandleQty(); + this.updateBtn() }, openDetail(item) { @@ -372,7 +375,9 @@ this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { if (res) { this.getDetail() - } + } else { + this.isAllReceived=true + } }); } diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue index fbc31272..7014a8da 100644 --- a/src/pages/fg/coms/comNoReceiptPopup.vue +++ b/src/pages/fg/coms/comNoReceiptPopup.vue @@ -99,6 +99,29 @@ + + + + 创建上架申请 + + + + + + + + + + + 创建检验申请 + + + + + + @@ -159,7 +182,6 @@ showProductLineSelect: false, productLineList: [], productionLineName: "请选择生产线", - productLineCode: "", batch: "", packUnitName: "请选择包装规格", packUnit: "", @@ -177,7 +199,8 @@ rawLocationCode: "", workshop: "", bomVersion: "", - uom: "" + putAwayRequestSwitch:true, + putAwayInspectSwitch:true } }, props: { @@ -226,6 +249,8 @@ this.rawLocationCode = "" this.workshop = "" this.bomVersion ="" + this.putAwayRequestSwitch=true, + this.putAwayInspectSwitch=true }, @@ -289,7 +314,10 @@ fgLocationCode: this.fgLocationCode, rawLocationCode: this.rawLocationCode, workshop: this.workshop, - bomVersion :this.bomVersion + bomVersion :this.bomVersion, + putAwayRequestSwitch:this.putAwayRequestSwitch, + putAwayInspectSwitch:this.putAwayInspectSwitch + }; this.closeRequestPopup(); this.$emit("confirm", item); @@ -477,6 +505,17 @@ return item.label } }, + switchPutAwayRequest(value){ + console.log(value) + console.log("打印"+this.putAwayRequestSwitch) + this.putAwayRequestSwitch =value; + }, + + switchPutAwayInspect(value){ + console.log(value) + this.putAwayInspectSwitch =value; + } + } } diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue index 9ce9c4f6..4f7bf20a 100644 --- a/src/pages/fg/coms/comReceiptPopup.vue +++ b/src/pages/fg/coms/comReceiptPopup.vue @@ -95,6 +95,27 @@ + + + + 创建上架申请 + + + + + + + + + + 创建检验申请 + + + + + @@ -170,7 +191,9 @@ showDateSelect: false, planDateList: [], fgLocationCode: "", - rawLocationCode: "" + rawLocationCode: "", + putAwayRequestSwitch:true, + putAwayInspectSwitch:true } }, props: { @@ -218,6 +241,8 @@ this.planDateList = [] this.fgLocationCode = "" this.rawLocationCode = "" + this.putAwayRequestSwitch=true + this.putAwayInspectSwitch=true }, @@ -274,7 +299,9 @@ planNumber: this.planNumber, workStationCode: this.workStationCode, fgLocationCode: this.fgLocationCode, - rawLocationCode: this.rawLocationCode + rawLocationCode: this.rawLocationCode, + putAwayRequestSwitch:this.putAwayRequestSwitch, + putAwayInspectSwitch:this.putAwayInspectSwitch }; this.closeRequestPopup(); this.$emit("confirm", item); @@ -370,6 +397,8 @@ // this.packUnitList = [] this.itemCodeList = []; this.showSelectItemCode(); + this.putAwayRequestSwitch=true + this.putAwayInspectSwitch=true }, showItemList() { @@ -508,6 +537,16 @@ return item.label } }, + switchPutAwayRequest(value){ + console.log(value) + console.log("打印"+this.putAwayRequestSwitch) + this.putAwayRequestSwitch =value; + }, + + switchPutAwayInspect(value){ + console.log(value) + this.putAwayInspectSwitch =value; + } } } diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue index 9e2bf839..9cd7eca8 100644 --- a/src/pages/fg/receiptByPlan.vue +++ b/src/pages/fg/receiptByPlan.vue @@ -211,6 +211,8 @@ packUnit: result.packUnit, workStationCode: result.workStationCode, fgLocationCode: result.fgLocationCode, + putAwayRequestSwitch:result.putAwayRequestSwitch, + putAwayInspectSwitch:result.putAwayInspectSwitch, subList: [] } }, @@ -300,25 +302,18 @@ } else { throw new Error("提交失败") } - - //装配收货记录 生成后 创建 制品上架申请 - let createProductputawaySwitch = getSwitchInfoByCode( - "CreateProductputawayRequestAfterProductreceiptRecordCreated") - // if (createProductputawaySwitch) { - // createPutawayRequestByPlan(list[0].requestNumber).then(res => { - // createInspectRequestByPlan(list[0].requestNumber) - // }) - // } - //创建上架申请和检验申请 - if (createProductputawaySwitch) { - if (list.length > 0 && list[0].requestNumber) { - createPutawayRequestByPlan(list[0].requestNumber).then(res => { - createInspectRequestByPlan(list[0].requestNumber) - }) + + //创建上架申请 + if(this.dataContent.putAwayRequestSwitch){ + if(list.length>0&&list[0].requestNumber){ + await createPutawayRequestByPlan(list[0].requestNumber) } - } else { //创建检验申请 - if (list.length > 0 && list[0].requestNumber) { - createInspectRequestByPlan(list[0].requestNumber) + } + + //创建检验申请 + if(this.dataContent.putAwayInspectSwitch){ + if(list.length>0&&list[0].requestNumber){ + await createInspectRequestByPlan(list[0].requestNumber) } } @@ -352,9 +347,7 @@ this.index = 1 } } - // else { - // throw new Error("未查找到单据信息") - // } + uni.hideLoading() if (isAllSubmit) { this.clearData() diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue index 25cb7dcb..678554f8 100644 --- a/src/pages/fg/receiptNoPlan.vue +++ b/src/pages/fg/receiptNoPlan.vue @@ -149,7 +149,7 @@ index: 1, loadingType: "", pageSize: 20, - scanedQty: 0 + scanedQty: 0, }; }, @@ -210,7 +210,9 @@ bomVersion: result.bomVersion, workshop: result.workshop, team: "", - shift: "" + shift: "", + putAwayRequestSwitch:result.putAwayRequestSwitch, + putAwayInspectSwitch:result.putAwayInspectSwitch } }, @@ -273,7 +275,7 @@ let list = [] var planData = await planReceiptSubmit(params) - if (planData.data) { + if (planData.data&&planData.data.length>0) { planData.data.forEach(item => { list.push({ itemCode: item.itemCode, // 物品代码 @@ -296,18 +298,25 @@ } else { throw new Error("提交失败") } - - let createProductputawaySwitch = getSwitchInfoByCode( - "CreateProductputawayRequestAfterProductreceiptRecordCreated") - //创建上架申请和检验申请 - if (createProductputawaySwitch) { - createPutawayRequestByPlan(list[0].requestNumber).then(res => { - createInspectRequestByPlan(list[0].requestNumber) - }) - } else { //创建检验申请 - createInspectRequestByPlan(list[0].requestNumber) + //创建上架申请 + if(this.dataContent.putAwayRequestSwitch){ + if(list.length>0&&list[0].requestNumber){ + await createPutawayRequestByPlan(list[0].requestNumber) + } + } + + //创建检验申请 + if(this.dataContent.putAwayInspectSwitch){ + if(list.length>0&&list[0].requestNumber){ + await createInspectRequestByPlan(list[0].requestNumber) + } } - this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list) + var hintMsg ="提交成功\n生成装配收货记录\n"; + if(list.length>0&&list[0].requestNumber){ + hintMsg += list[0].requestNumber + } + + this.showCommitSuccessMessage(hintMsg, list) this.scanedQty = this.scanedQty + this.showList.length; this.showList = []; this.dataContent.handleQty = 0; diff --git a/src/pages/itemHold/record/recordListDetail.vue b/src/pages/itemHold/record/recordListDetail.vue index eff60b19..ea26fb72 100644 --- a/src/pages/itemHold/record/recordListDetail.vue +++ b/src/pages/itemHold/record/recordListDetail.vue @@ -183,6 +183,8 @@ //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { this.receiveDisable = false; + }else { + this.receiveDisable = true; } }, @@ -198,6 +200,7 @@ updateData() { this.calcHandleQty(); + this.updateBtn() }, openDetail(item) { @@ -378,7 +381,9 @@ this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { if (res) { this.getDetail() - } + } else { + this.isAllReceived=true + } }); } diff --git a/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue index 478c9878..cf85c4e0 100644 --- a/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue +++ b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue @@ -181,6 +181,8 @@ //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { this.receiveDisable = false; + }else { + this.receiveDisable = true; } }, @@ -196,6 +198,7 @@ updateData() { this.calcHandleQty(); + this.updateBtn() }, openDetail(item) { @@ -377,7 +380,9 @@ this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { if (res) { this.getDetail() - } + } else { + this.isAllReceived=true + } }); } diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue index 2cd84358..88b999eb 100644 --- a/src/pages/putaway/job/quantityPutawayJob.vue +++ b/src/pages/putaway/job/quantityPutawayJob.vue @@ -1,24 +1,28 @@