From 90be1fd3c4ae3c383e850988c34d27f0f66a1f4b Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sun, 14 Apr 2024 11:17:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E5=85=88=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 28 +++++----- pages/outWarehouse/outWarehouse.vue | 57 ++++++++++++++++++-- pages/watchGoods/goodsdetail/goodsdetail.vue | 48 +++++++++++------ utils/request.js | 13 +++-- 4 files changed, 110 insertions(+), 36 deletions(-) diff --git a/manifest.json b/manifest.json index fe138d8..7379acc 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "干巷仓库APP", - "appid" : "__UNI__A67E78B", + "appid" : "__UNI__A82C0EC", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -94,19 +94,19 @@ "vueVersion" : "2", "h5" : { "template" : "static/index.html", - "devServer" : { - "port" : 9090, - "https" : false, - "disableHostCheck" : true, - "proxy" : { - "/api" : { - "target" : "http://192.168.0.31:8888", - "pathRewrite" : { - "^/api" : "" - } - } - } - }, + // "devServer" : { + // "port" : 9090, + // "https" : false, + // "disableHostCheck" : true, + // "proxy" : { + // "/api" : { + // "target" : "http://192.168.0.31:8888", + // "pathRewrite" : { + // "^/api" : "" + // } + // } + // } + // }, "title" : "RuoYi-App", "router" : { "mode" : "hash", diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue index bf92d75..50c5988 100644 --- a/pages/outWarehouse/outWarehouse.vue +++ b/pages/outWarehouse/outWarehouse.vue @@ -21,6 +21,12 @@ + + + + 选择物料号 + + 出库清单 @@ -80,7 +86,11 @@ export default { //工单计划 outOrderPlan: [], // 1-仓库扫码 2-货物扫码 3-出货单扫码 - searchType: 3 + searchType: 3, + + show: false, + columns: [['无物料号']], + material_id: '无物料号' //物料号 }; }, watch: {}, @@ -120,6 +130,17 @@ export default { this.searchType = 2; this.outInfo = data; this.newMaterialList = []; + + let arry=[] + this.columns=[]; + + this.outInfo.materialList.forEach((item)=>{ + arry.push(item.partnumber); + + }) + this.columns.push(arry) + this.material_id=this.outInfo.materialList[0].partnumber + } else if (type === 2) { if (this.newMaterialList.length > 0) { uni.showModal({ @@ -132,8 +153,10 @@ export default { } const checkData = { production_packcode: data.originalCode, - shipment_num: this.outInfo.shipmentNum + shipment_num: this.outInfo.shipmentNum, + partnumber:this.material_id }; + //检查是否可以出货 WarehoseApi.checkProductionOut(checkData).then((res) => { if (res.code === 200 && res.data) { this.newMaterialList.push(data); @@ -203,7 +226,8 @@ export default { if (res.confirm) { const data = { shipmentNum: this.outInfo.shipmentNum, - patchCode: [this.newMaterialList[0].patchCode] + patchCode: [this.newMaterialList[0].patchCode], + }; WarehoseApi.doMaterialOut(data).then((res) => { if (res.code !== 200) { @@ -213,6 +237,22 @@ export default { showCancel: false, confirmText: '确认' }); + + if(res.data.item1=100){ + uni.showModal({ + title: '提示', + content: '此物料已经出库完成，没有可以出库的了', + showCancel: false, + confirmText: '确认' + }); + }else if(res.data.item2=100){ + uni.showModal({ + title: '提示', + content: '不是此物料最早批次，无法出库', + showCancel: false, + confirmText: '确认' + }); + } return; } uni.showModal({ @@ -262,6 +302,17 @@ export default { } } }); + }, + //取消 + pick_cancel() { + this.show = false; + }, + // 确认 + pick_confirm(e) { + console.log(e.value); + this.material_id = e.value[0]; + console.log(this.material_id); + this.show = false; } } }; diff --git a/pages/watchGoods/goodsdetail/goodsdetail.vue b/pages/watchGoods/goodsdetail/goodsdetail.vue index ccfc979..fa54efa 100644 --- a/pages/watchGoods/goodsdetail/goodsdetail.vue +++ b/pages/watchGoods/goodsdetail/goodsdetail.vue @@ -1,26 +1,26 @@