From e84a975fe9977522f725a9dc28b5fff7eb566cb2 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 16 Apr 2025 09:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=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