From 1b7fc00e474c31ff8f83cddac8a71e8f5c259eb4 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 13 Feb 2025 09:57:55 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BA=8C=E6=A5=BC=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=87=BA=E5=BA=93\=E4=BA=8C=E6=A5=BC=E5=8F=96=E8=B4=A7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4\=E4=BA=8C=E6=A5=BC=E8=B4=A7=E6=9E=B6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 24 ++++ pages/home/home.vue | 2 +- pages/outbound/bill-out-store.vue | 4 + pages/outbound/pick-confirm-2nd.vue | 84 ++++++++++++++ pages/outbound/produce-out-store-2nd.vue | 141 +++++++++++++++++++++++ pages/outbound/shelf-bind-2nd.vue | 88 ++++++++++++++ utils/getData2.js | 27 +++++ utils/mork2.js | 14 +++ 8 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 pages/outbound/pick-confirm-2nd.vue create mode 100644 pages/outbound/produce-out-store-2nd.vue create mode 100644 pages/outbound/shelf-bind-2nd.vue diff --git a/pages.json b/pages.json index 2707bdc..e697dba 100644 --- a/pages.json +++ b/pages.json @@ -274,6 +274,30 @@ } } + ,{ + "path" : "pages/outbound/produce-out-store-2nd", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/outbound/pick-confirm-2nd", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/outbound/shelf-bind-2nd", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 4256c86..99b4d2b 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -52,7 +52,7 @@ ], menuList: [ {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]}, - {title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}]}, + {title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}, {title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]}, {title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]}, {title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]}, {title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]} diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue index 5a4d1ef..efdbd44 100644 --- a/pages/outbound/bill-out-store.vue +++ b/pages/outbound/bill-out-store.vue @@ -181,6 +181,10 @@ try { let res = await outStorageConfirm(obj) if (res.code === '200') { + uni.showToast({ + title: res.msg, + icon: 'none' + }) this.toEmpty() } this.disabled = false diff --git a/pages/outbound/pick-confirm-2nd.vue b/pages/outbound/pick-confirm-2nd.vue new file mode 100644 index 0000000..3c9c6f9 --- /dev/null +++ b/pages/outbound/pick-confirm-2nd.vue @@ -0,0 +1,84 @@ + + + diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue new file mode 100644 index 0000000..e8bf820 --- /dev/null +++ b/pages/outbound/produce-out-store-2nd.vue @@ -0,0 +1,141 @@ + + + diff --git a/pages/outbound/shelf-bind-2nd.vue b/pages/outbound/shelf-bind-2nd.vue new file mode 100644 index 0000000..67ba300 --- /dev/null +++ b/pages/outbound/shelf-bind-2nd.vue @@ -0,0 +1,88 @@ + + + diff --git a/utils/getData2.js b/utils/getData2.js index afd1c98..bd9b189 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -218,4 +218,31 @@ export const structattrPage = (page, size, code, mcode, has) => request({ export const outStorageMaterConfirm = (obj) => request({ url:'api/pda/outStorage/materConfirm', data: obj +}) + +/** + * 二楼生产出库 + */ +export const getCtuOrderList = (scode, bcode) => request({ + url:'api/pda/outStorage/getCtuOrderList?site_code=' + scode + '&bill_code=' + bcode, + method: 'GET' +}) +export const ctuOutConfirm = (scode, bcode, arr) => request({ + url:'api/pda/outStorage/ctuOutConfirm', + data: {site_code: scode, bill_code: bcode, form_data: arr} +}) + +/** + * 二楼取货确认 + */ +export const takeConfirm = (scode, bcode) => request({ + url:'api/pda/outStorage/takeConfirm', + data: {site_code: scode, shelf_code: bcode} +}) +/** + * 二楼货架绑定 + */ +export const bindOrUnbind = (scode, bcode, mode) => request({ + url:'api/point/bindOrUnbind', + data: {site_code: scode, shelf_code: bcode, mode: mode} }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 91a4de4..70ea2c4 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -236,4 +236,18 @@ export const structattrPage = () => { "msg": "" } return res +} +export const getCtuOrderList = () => { + let res = { + "code": "200", + content: [{material_name: '1'}, {material_name: '2'}, {material_name: '3'}, {material_name: '4'}, {material_name: '5'}, {material_name: '6'}, {material_name: '7'}, {material_name: '8'}, {material_name: '9'}, {material_name: '10'}, {material_name: '11'}, {material_name: '12'}] + } + return res +} +export const ctuOutConfirm = () => { + let res = { + "code": "200", + msg: 'ok' + } + return res } \ No newline at end of file