From 2b8b15fd74dee4c3f27ce8fa7fa35801cc780a29 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 15 Apr 2025 16:12:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6--=E4=B9=B0=E6=96=AD=EF=BC=8C=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=BF=85=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue index 7be9959d84..5812f91b8c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue @@ -37,7 +37,7 @@ - *上传买断证明 + 上传买断证明 From fb0cc776191090193cb61b7ccc0ddd40adfa4d6c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 15 Apr 2025 16:49:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E9=85=8D=E4=BB=B6=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/Common/dictcommons.js | 11 +- .../api/storage/oldPartsInAndOutStorage.js | 41 ------- .../src/api/storage/oldPartsInvertory.js | 107 +++++++----------- .../src/views/storage/inventory/inventory.vue | 2 +- .../storage/inventory/inventoryRefer.vue | 2 +- .../storage/oldPartsInAndOutStorage/index.vue | 7 +- .../views/storage/oldPartsInvertory/index.vue | 7 +- .../sparePartsInventory.vue | 2 +- 8 files changed, 61 insertions(+), 118 deletions(-) diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 4a5c66a39e..993a51f4dd 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -365,7 +365,7 @@ export function getGoodsCategory(params) { }) } -// 查询分公司orgSidPath下的所有仓库 +// 查询分公司orgSidPath下的所有仓库(可传参数仓库类型) export function getAllWarehouse(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', @@ -403,3 +403,12 @@ export function getAllRackByKQSid(data) { params: data }) } + +// 根据仓库sid查询库区 +export function getWarehouseareas(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/selectAll', + method: 'get', + params: data + }) +} diff --git a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js index db61db7ab6..8d38e6c403 100644 --- a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js +++ b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js @@ -23,46 +23,5 @@ export default { 'Content-Type': 'application/json' } }) - }, - // 选择厂家 - choiceManufacturer: function(params) { - return request({ - url: '/yxtbase/apiadmin/base/basemanufacturer/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 根据仓库查询库区 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - params: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 根据库区查询库位 - getAllRackByKQSid: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid', - method: 'get', - params: data - }) } } diff --git a/yxt-as-ui/src/api/storage/oldPartsInvertory.js b/yxt-as-ui/src/api/storage/oldPartsInvertory.js index 406b2c6b72..d422268adb 100644 --- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js +++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js @@ -1,71 +1,44 @@ import request from '@/utils/request' export default { - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/oldPageList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 获取旧件出入库记录详情 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data, - method: 'get' - }) - }, - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 导出报表 - exportExcel: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/excelList', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 根据仓库查询库区 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - params: data - }) - }, - // 根据库区查询库位 - getAllRackByKQSid: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid', - method: 'get', - params: data - }) - } + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/oldPageList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 获取旧件出入库记录详情 + init: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data, + method: 'get' + }) + }, + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 导出报表 + exportExcel: function(data) { + return request({ + url: '/wms/apiadmin/WmsOldInventory/excelList', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + } } diff --git a/yxt-as-ui/src/views/storage/inventory/inventory.vue b/yxt-as-ui/src/views/storage/inventory/inventory.vue index 13b3391091..6ac680be13 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventory.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventory.vue @@ -206,7 +206,7 @@ export default { }, methods: { init() { - getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { + getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => { if (res.success) { this.warehouseList = res.data } diff --git a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue index e53d95d9ed..d6ff2ed595 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue @@ -228,7 +228,7 @@ export default { this.busType_list = res.data } }) - getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { + getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => { if (res.success) { this.warehouseList = res.data } diff --git a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue index 11b31f9856..3f6a48ba19 100644 --- a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue @@ -121,6 +121,7 @@ import req from '@/api/storage/oldPartsInAndOutStorage.js' import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import { typeValues } from '@/api/Common/dictcommons' +import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons' import req2 from '@/api/goods/factory.js' export default { @@ -204,7 +205,7 @@ export default { }, methods: { init() { - req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => { + getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => { if (res.success) { this.warehouseList = res.data } @@ -354,7 +355,7 @@ export default { } }, getWarehouseAreaList(sid) { - req.getWarehouseareas({ ckSid: sid }).then((res) => { + getWarehouseareas({ ckSid: sid }).then((res) => { if (res.success) { this.warehouseAreaList = res.data } @@ -372,7 +373,7 @@ export default { } }, getWareHouseCodeList(sid) { - req.getAllRackByKQSid({ kqSid: sid }).then((res) => { + getAllRackByKQSid({ kqSid: sid }).then((res) => { if (res.success) { this.warehouseRackCodeList = res.data } diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue index c3dc4eb099..5e1563ee87 100644 --- a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue @@ -97,6 +97,7 @@ import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import req from '@/api/storage/oldPartsInvertory.js' import divInfo from './oldPartsInvertoryInfo.vue' +import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons' export default { components: { @@ -330,7 +331,7 @@ export default { this.viewState = 1 }, getWarehouseList() { - req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => { + getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => { if (res.success) { this.warehouseList = res.data } @@ -350,7 +351,7 @@ export default { } }, getWarehouseAreaList(sid) { - req.getWarehouseareas({ ckSid: sid }).then((res) => { + getWarehouseareas({ ckSid: sid }).then((res) => { if (res.success) { this.warehouseAreaList = res.data } @@ -368,7 +369,7 @@ export default { } }, getWareHouseCodeList(sid) { - req.getAllRackByKQSid({ kqSid: sid }).then((res) => { + getAllRackByKQSid({ kqSid: sid }).then((res) => { if (res.success) { this.warehouseRackCodeList = res.data } diff --git a/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue b/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue index 4e5945373a..c65f15ff52 100644 --- a/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue +++ b/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue @@ -165,7 +165,7 @@ export default { }, methods: { init() { - getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { + getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => { if (res.success) { this.warehouseList = res.data } From ce2ada7467bb82fa08963f78d33033d90e41cb4a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 15 Apr 2025 17:03:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/storage/inventory/inventory.vue | 12 ++++++------ .../src/views/storage/inventory/inventoryRefer.vue | 12 ++++++------ .../sparePartsInventory/sparePartsInventory.vue | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/yxt-as-ui/src/views/storage/inventory/inventory.vue b/yxt-as-ui/src/views/storage/inventory/inventory.vue index 6ac680be13..b86b287d3b 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventory.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventory.vue @@ -303,6 +303,9 @@ export default { this.getList() }, selectWarehouseName(val) { + this.warehouseZoneList = [] + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseList.filter((item) => item.sid === val) if (choose !== null || choose.length > 0) { this.listQuery.params.warehouseName = choose[0].warehouseName @@ -313,9 +316,6 @@ export default { this.listQuery.params.wareZoneName = '' this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.warehouseZoneList = [] - this.wareAreaList = [] - this.warehouseRackList = [] }, getWarehouseZoneList(sid) { getAllWarehousezoneBysid({ ckSid: sid }).then((res) => { @@ -325,6 +325,8 @@ export default { }) }, selectWareZoneName(val) { + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseZoneList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareZoneName = choose[0].zoneName @@ -334,8 +336,6 @@ export default { } this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.wareAreaList = [] - this.warehouseRackList = [] }, getWareAreaList(sid) { getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => { @@ -345,6 +345,7 @@ export default { }) }, selectWareAreaName(val) { + this.warehouseRackList = [] const choose = this.wareAreaList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareAreaName = choose[0].areaName @@ -353,7 +354,6 @@ export default { this.listQuery.params.wareAreaName = '' } this.listQuery.params.warehouseRackCode = '' - this.warehouseRackList = [] }, getWarehouseRackList(sid) { getAllRackByKQSid({ kqSid: sid }).then((res) => { diff --git a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue index d6ff2ed595..9623a01422 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue @@ -316,6 +316,9 @@ export default { this.getList() }, selectWarehouseName(val) { + this.warehouseZoneList = [] + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseList.filter((item) => item.sid === val) if (choose !== null || choose.length > 0) { this.listQuery.params.warehouseName = choose[0].warehouseName @@ -326,9 +329,6 @@ export default { this.listQuery.params.wareZoneName = '' this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.warehouseZoneList = [] - this.wareAreaList = [] - this.warehouseRackList = [] }, getWarehouseZoneList(sid) { getAllWarehousezoneBysid({ ckSid: sid }).then((res) => { @@ -338,6 +338,8 @@ export default { }) }, selectWareZoneName(val) { + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseZoneList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareZoneName = choose[0].zoneName @@ -347,8 +349,6 @@ export default { } this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.wareAreaList = [] - this.warehouseRackList = [] }, getWareAreaList(sid) { getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => { @@ -358,6 +358,7 @@ export default { }) }, selectWareAreaName(val) { + this.warehouseRackList = [] const choose = this.wareAreaList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareAreaName = choose[0].areaName @@ -366,7 +367,6 @@ export default { this.listQuery.params.wareAreaName = '' } this.listQuery.params.warehouseRackCode = '' - this.warehouseRackList = [] }, getWarehouseRackList(sid) { getAllRackByKQSid({ kqSid: sid }).then((res) => { diff --git a/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue b/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue index c65f15ff52..57fed03eb2 100644 --- a/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue +++ b/yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue @@ -243,6 +243,9 @@ export default { this.getList() }, selectWarehouseName(val) { + this.warehouseZoneList = [] + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseList.filter((item) => item.sid === val) if (choose !== null || choose.length > 0) { this.listQuery.params.warehouseName = choose[0].warehouseName @@ -253,9 +256,6 @@ export default { this.listQuery.params.wareZoneName = '' this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.warehouseZoneList = [] - this.wareAreaList = [] - this.warehouseRackList = [] }, getWarehouseZoneList(sid) { getAllWarehousezoneBysid({ ckSid: sid }).then((res) => { @@ -265,6 +265,8 @@ export default { }) }, selectWareZoneName(val) { + this.wareAreaList = [] + this.warehouseRackList = [] const choose = this.warehouseZoneList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareZoneName = choose[0].zoneName @@ -274,8 +276,6 @@ export default { } this.listQuery.params.wareAreaName = '' this.listQuery.params.warehouseRackCode = '' - this.wareAreaList = [] - this.warehouseRackList = [] }, getWareAreaList(sid) { getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => { @@ -285,6 +285,7 @@ export default { }) }, selectWareAreaName(val) { + this.warehouseRackList = [] const choose = this.wareAreaList.filter((item) => item.sid === val) if (choose !== null && choose.length > 0) { this.listQuery.params.wareAreaName = choose[0].areaName @@ -293,7 +294,6 @@ export default { this.listQuery.params.wareAreaName = '' } this.listQuery.params.warehouseRackCode = '' - this.warehouseRackList = [] }, getWarehouseRackList(sid) { getAllRackByKQSid({ kqSid: sid }).then((res) => { From e84a975fe9977522f725a9dc28b5fff7eb566cb2 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 16 Apr 2025 09:01:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsinventory/FittingsInventoryQuery.java | 5 +- .../wmsinventory/FittingsInventoryVo.java | 3 + .../wmsinventory/WmsInventoryMapper.xml | 25 +++++--- .../wmsinventory/WmsInventoryQuery.java | 5 ++ .../wmsinventory/WmsInventoryService.java | 18 ++++++ .../wmsinventory/WmsInventoryVo.java | 5 ++ .../WmsInventoryRecordMapper.xml | 57 ++++++++++--------- .../WmsInventoryRecordService.java | 10 ++++ .../WmsInventoryRecordsQuery.java | 4 ++ .../WmsInventoryRecordsVo.java | 4 ++ 10 files changed, 102 insertions(+), 34 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java index e8b675f783..8b86767963 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java @@ -1,6 +1,7 @@ package com.yxt.wms.biz.inventory.wmsinventory; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -44,5 +45,7 @@ public class FittingsInventoryQuery implements Query { * 仓库 */ private String warehouseName; - + private String warehouseRackCode; + private String wareAreaName; + private String wareZoneName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java index b613a783ad..7d9a4682e6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryVo.java @@ -51,5 +51,8 @@ public class FittingsInventoryVo implements Vo { * 仓库 */ private String warehouseName; + private String warehouseRackCode; + private String wareAreaName; + private String wareZoneName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 086ca43d69..861e4b6129 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -16,6 +16,8 @@ a.manufacturerName, a.warehouseName, a.warehouseRackCode, + wa.areaName wareAreaName, + wz.zoneName wareZoneName, a.count, a.cost, a.taxRate tax, @@ -24,7 +26,10 @@ FROM wms_inventory a LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid - LEFT JOIN wms_warehouse_info as i ON a.warehouseSid = i.sid + LEFT JOIN wms_warehouse_rack as wr ON a.warehouseRackSid = wr.sid + LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid + LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid + LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid ${ew.sqlSegment} @@ -452,16 +457,22 @@ wi.goodsSkuOwnSpec, wi.unit, wi.warehouseName, + wi.warehouseRackCode, + wa.areaName wareAreaName, + wz.zoneName wareZoneName, wi.manufacturerName, wi.supplierName billObjName, IFNULL(SUM(count),0) as inventoryCount, s.orgSidPath FROM wms_inventory as wi - LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid + LEFT JOIN wms_warehouse_rack as wr ON wi.warehouseRackSid = wr.sid + LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid + LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid + LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid - GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.supplierName) as a + GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseRackSid,wi.goodsSkuCode,wi.supplierName) as a ${ew.sqlSegment} @@ -815,12 +826,12 @@ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java index 874a4013e0..251a9ba0eb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java @@ -25,6 +25,11 @@ public class WmsInventoryQuery implements Query { @ApiModelProperty("库位编码") private String warehouseRackCode; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域名称") + private String wareZoneName; + @ApiModelProperty("批次号") private String batchNumber; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index a875823308..ac20cec993 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -115,6 +115,12 @@ public class WmsInventoryService extends MybatisBaseService wrapper.like("a.billObjName", query.getName()) .or().like("a.deptName", query.getName()) @@ -927,6 +942,9 @@ public class WmsInventoryService extends MybatisBaseService SELECT IFNULL(SUM(d.currentBalance), 0) AS count FROM wms_inventory_settlebill_detail AS d - LEFT JOIN wms_inventory_settlebill AS s - ON d.billSid = s.sid + LEFT JOIN wms_inventory_settlebill AS s + ON d.billSid = s.sid WHERE s.settleState = 2 AND s.createTime <= #{settleTime} GROUP BY d.billSid ORDER BY s.createTime DESC - LIMIT 1 + LIMIT 1 SELECT IFNULL(SUM(r.count), 0) AS `count`, - r.busTypeValue + r.busTypeValue FROM wms_inventory_record AS r ${ew.sqlSegment} @@ -50,24 +50,24 @@ SELECT - billNo + billNo FROM - wms_inventory_record + wms_inventory_record WHERE billType = '0' AND goodsID = #{content} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 9c373a0e93..4e2b3d103f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -294,10 +294,20 @@ public class WmsInventoryRecordService extends MybatisBaseService