From 1853cf90946fe1f02a75350aa16b24b4bf0bb110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?= <8702040+cai-ling@user.noreply.gitee.com> Date: Wed, 13 Nov 2024 19:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=9811/07=E6=94=B9=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/management/in-storage.vue | 2 +- pages/management/in-storage_new.vue | 6 +- pages/management/receive-confirm_241107.vue | 611 ++++++++++++++++++++ utils/getData2.js | 166 ++++-- utils/mork2.js | 46 ++ 5 files changed, 777 insertions(+), 54 deletions(-) create mode 100644 pages/management/receive-confirm_241107.vue diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 1cbc3a4..f1d0aba 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -398,7 +398,7 @@ return } try { - let res = await easOutInBillUpdate(this.checkArr1) + let res = await easOutInBillUpdate(1, this.checkArr1) if (res.code === 1) { this.disabled1 = false this.checkArr1 = [] diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue index 7af5237..d143426 100644 --- a/pages/management/in-storage_new.vue +++ b/pages/management/in-storage_new.vue @@ -4,12 +4,12 @@ - + - + - + diff --git a/pages/management/receive-confirm_241107.vue b/pages/management/receive-confirm_241107.vue new file mode 100644 index 0000000..19a12bf --- /dev/null +++ b/pages/management/receive-confirm_241107.vue @@ -0,0 +1,611 @@ + + + + + diff --git a/utils/getData2.js b/utils/getData2.js index b5a99fe..44dfffe 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -91,6 +91,35 @@ export const updateBillDetail = (arr) => request({ url:'api/easOutInBillDetail/updateBillDetail', data: arr }) +/** + * 入库新接口 + * 2024.10.24 + */ +// 查看分配明细 +export const viewAssignDtl = (obj) => request({ + url:'api/stIvtStockAssignDtl/viewAssignDtl', + data: obj +}) +// 查看分配明细->确认 +export const updateAssignDtl = (arr) => request({ + url:'api/stIvtStockAssignDtl/updateAssignDtl', + data: arr +}) +// 分配库位查看详情 +export const inWarehouseAssignLocation = (arr, type) => request({ + url:'api/easOutInBillDetail/inWarehouseAssignLocation', + data: {details: arr, type: type} +}) +// 分配库位查看详情确认 +export const addAssignDtl = (arr) => request({ + url:'api/stIvtStockAssignDtl/addAssignDtl', + data: arr +}) +// 库存提交 +export const inWarehouseCommit = (arr, type) => request({ + url:'api/easOutInBillDetail/inWarehouseCommit', + data: {details: arr, type: type} +}) /** * 调拨维护 @@ -150,7 +179,30 @@ export const receiptPage = (fuzzy, kczzbm, page, size) => request({ size: size } }) -// 2.收货单明细-副表格2024/11/07 +// 2.收货单明细-副表格 +export const receiptBillPage = (fuzzy, djid, page, size) => request({ + url:'api/receiptBill/page', + data: { + fuzzy: fuzzy, + djid: djid, + page: page, + size: size + } +}) +// 3.收货单明细-行修改 +export const receiptBillUpdate = (obj) => request({ + url:'api/receiptBill/update', + data: obj +}) +// 4.确认收货 +export const receiptBillConfirm = (arr) => request({ + url:'api/receiptBill/confirm', + data: arr +}) +/** + * 收货确认新接口2024/11/07 + */ +// 1.收货单明细-副表格 export const receiptBillDetailPage = (fuzzy, djid, page, size) => request({ url:'api/receiptBillDetail/page', data: { @@ -160,78 +212,92 @@ export const receiptBillDetailPage = (fuzzy, djid, page, size) => request({ size: size } }) -// export const receiptBillPage = (fuzzy, djid, page, size) => request({ -// url:'api/receiptBill/page', -// data: { -// fuzzy: fuzzy, -// djid: djid, -// page: page, -// size: size -// } -// }) -// 3.副表格修改-数量和仓库编码 +// 2.副表格修改-数量和仓库编码 export const receiptBillDetailUpdate = (arr) => request({ url:'api/receiptBillDetail/update', data: arr }) -// 4.库位分配 + +// 3.库位分配 export const warehouseAssignLocation = (arr) => request({ url:'api/receiptBill/warehouseAssignLocation', data: {details: arr} }) -// 5.库位分配-确认 +// 4.库位分配-确认 export const stIvtaddAssignDtl = (arr) => request({ url:'api/stIvtStockAssignDtl/addAssignDtl', data: arr }) -// 6.一键设置仓库-确认 +// 5.一键设置仓库-确认 export const receiptBillDetailSetStor = (ckbm, details) => request({ url:'api/receiptBillDetail/setStor', data: {ckbm: ckbm, details: details} }) -// 6.确认收货 -export const receiptBillConfirm = (arr) => request({ - url:'api/receiptBill/confirm', - data: arr -}) -// 3.收货单明细-行修改 -export const receiptBillUpdate = (obj) => request({ - url:'api/receiptBill/update', - data: obj -}) -// 4.单据直接调拨 -// export const receiptBillConfirm = (arr) => request({ -// url:'api/receiptBill/confirm', -// type: 1, -// data: arr -// }) /** - * 入库新接口 - * 2024.10.24 + * 移库 */ -// 查看分配明细 -export const viewAssignDtl = (obj) => request({ - url:'api/stIvtStockAssignDtl/viewAssignDtl', +// 移库-主表格 +export const stIvtMoveinvMovePage = (fuzzy, ckbm, page, size) => request({ + url:'api/stIvtMoveinv/movePage', + data: { + fuzzy: fuzzy, + ckbm: ckbm, + page: page, + size: size + } +}) +// 移库-副表格 +export const moveDtlByMoveId = (id) => request({ + url:'api/stIvtMoveinvdtl/moveDtlByMoveId/' + id, + method: 'GET' +}) +// 移库-修改数量和移出库位 +export const stIvtMoveinvUpdateDtl = (obj) => request({ + url:'api/stIvtMoveinvdtl/updateDtl', data: obj }) -// 查看分配明细->确认 -export const updateAssignDtl = (arr) => request({ - url:'api/stIvtStockAssignDtl/updateAssignDtl', +// 移库-确认移库 +export const stIvtMoveinvConfirmMove = (arr) => request({ + url:'api/stIvtMoveinvdtl/confirmMove', data: arr }) -// 分配库位查看详情 -export const inWarehouseAssignLocation = (arr, type) => request({ - url:'api/easOutInBillDetail/inWarehouseAssignLocation', - data: {details: arr, type: type} + +/** + * 盘点 + */ +// 盘点-主表格 +export const stIvtCheckdtlCheckPage = (fuzzy, ckbm, page, size) => request({ + url:'api/stIvtCheckdtl/checkPage', + data: { + fuzzy: fuzzy, + ckbm: ckbm, + page: page, + size: size + } }) -// 分配库位查看详情确认 -export const addAssignDtl = (arr) => request({ - url:'api/stIvtStockAssignDtl/addAssignDtl', +// 盘点-副表格 +export const checkDtlByCheckCode = (id) => request({ + url:'api/stIvtCheckdtl/checkDtlByCheckCode/' + id, + method: 'GET' +}) +// 盘点-修改盘点数量 +export const stIvtCheckdtlUpdateDtl = (obj) => request({ + url:'api/stIvtCheckdtl/updateDtl', + data: obj +}) +// 盘点-盘点完成 +export const stIvtCheckdtlCheckFinish = (arr) => request({ + url:'api/stIvtCheckdtl/checkFinish', + data: arr +}) +// 盘点-实物为准 +export const stIvtCheckdtlReally = (arr) => request({ + url:'api/stIvtCheckdtl/really', + data: arr +}) +// 盘点-财务为准 +export const stIvtCheckdtlBasedOnFinance = (arr) => request({ + url:'api/stIvtCheckdtl/basedOnFinance', data: arr }) -// 库存提交 -export const inWarehouseCommit = (arr, type) => request({ - url:'api/easOutInBillDetail/inWarehouseCommit', - data: {details: arr, type: type} -}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index e61d7c8..1ee2305 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -2273,4 +2273,50 @@ export const warehouseAssignLocation = () => { "desc": "查询成功" } return res +} + +export const stIvtMoveinvMovePage = () => { + let res = { + "pageNum": 1, + "pageSize": 10, + "totalPage": 109, + "totalElements": 1084, + "result": [ + { + "id": "0101", + "input_id": "btAAAAW8Wd5QCrde" + }, + { + "id": "0102", + "input_id": "btAAAAW8WdpQCrde" + } + ], + "code": 1, + "desc": "查询成功" + } + return res +} + +export const moveDtlByMoveId = () => { + let res = { + "pageNum": 1, + "pageSize": 10, + "totalPage": 109, + "totalElements": 1084, + "result": [ + { + "id": "0201", + "material_code": "btAAAAW8Wd5QCrde", + "qty": "1" + }, + { + "id": "0202", + "material_code": "btAAAAW8WdpQCrde", + "qty": "1" + } + ], + "code": 1, + "desc": "查询成功" + } + return res } \ No newline at end of file