库存查询修改

2 weeks ago · e84a975fe9
10 changed files with 102 additions and 34 deletions
--- 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;
 }
--- 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;

 }
--- 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
        <where>
            ${ew.sqlSegment}
        </where>
@ -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
        <where>
            ${ew.sqlSegment}
        </where>
@ -815,12 +826,12 @@
    <select id="selOaInventoryList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
        select wi.*
        from wms_inventory as wi
-                 LEFT JOIN wms_warehouse_info wwi on wi.warehouseSid = wwi.sid
+        LEFT JOIN wms_warehouse_info wwi on wi.warehouseSid = wwi.sid
        where wi.count > 0
-          and wi.useOrgSid = #{useOrgSid}
-          and wwi.warehouseTypeValue = #{warehouseTypeValue}
+        and wi.useOrgSid = #{useOrgSid}
+        and wwi.warehouseTypeValue = #{warehouseTypeValue}
        <if test="name != null and name != ''">
-         and wi.goodsID LIKE concat('%', #{name}, '%')
+            and wi.goodsID LIKE concat('%', #{name}, '%')
        </if>

    </select>
--- 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;

--- 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<WmsInventoryMapper,
        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
        }
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("wa.areaName", query.getWareAreaName());
+        }
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("wz.zoneName", query.getWareZoneName());
+        }
        if (StringUtils.isNotBlank(query.getSupplierName())) {
            qw.like("a.supplierName", query.getSupplierName());
        }
@ -919,6 +925,15 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
        if (StringUtils.isNotBlank(query.getWarehouseName())) {
            qw.like("a.warehouseName", query.getWarehouseName());
        }
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("a.wareAreaName", query.getWareAreaName());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
+        }
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("a.wareZoneName", query.getWareZoneName());
+        }
        if (StringUtils.isNotBlank(query.getName())) {
            qw.and(wrapper -> wrapper.like("a.billObjName", query.getName())
                    .or().like("a.deptName", query.getName())
@ -927,6 +942,9 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                    .or().like("a.manufacturerName", query.getName())
                    .or().like("a.useOrgName", query.getName())
                    .or().like("a.warehouseName", query.getName())
+                    .or().like("a.wareAreaName", query.getName())
+                    .or().like("a.wareZoneName", query.getName())
+                    .or().like("a.warehouseRackCode", query.getName())
            );
        }
        qw.notLike("a.goodsID","-O");
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVo.java
@ -49,4 +49,9 @@ public class WmsInventoryVo implements Vo {
    private String cost;
    @ApiModelProperty("税率")
    private String tax;
+
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
@ -21,18 +21,18 @@
    <select id="selInItCountBySettleTime" resultType="java.lang.String">
        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 &lt;= #{settleTime}
        GROUP BY d.billSid
        ORDER BY s.createTime DESC
-        LIMIT 1
+            LIMIT 1
    </select>
    <select id="selInboundAndOutboundCount"
            resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInAndOutboundVo">
        SELECT IFNULL(SUM(r.count), 0) as `count`,
-               r.billType
+        r.billType
        FROM wms_inventory_record AS r
        <where>
            ${ew.sqlSegment}
@ -41,7 +41,7 @@
    <select id="inventoryInboundAndOutboundStats"
            resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInventoryCountDetailsVo">
        SELECT IFNULL(SUM(r.count), 0) AS `count`,
-               r.busTypeValue
+        r.busTypeValue
        FROM wms_inventory_record AS r
        <where>
            ${ew.sqlSegment}
@ -50,24 +50,24 @@
    <select id="inventoryDetailsRecord"
            resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInventoryDetailsRecordVo">
        SELECT CASE
-                   r.billType
-                   WHEN '1' THEN
-                       IFNULL((r.currentCount - r.count), 0)
-                   WHEN '0' THEN
-                       IFNULL((r.currentCount + r.count), 0)
-                   END initCount,
-               r.currentCount,
-               r.count,
-               r.busTypeValue,
-               r.goodsSpuName,
-               r.createTime,
-               r.goodsSpuName,
-               r.goodsSkuTitle,
-               r.goodsSkuCode,
-               r.goodsSkuOwnSpec,
-               r.unit,
-               r.warehouseName,
-               r.warehouseRackCode
+        r.billType
+        WHEN '1' THEN
+        IFNULL((r.currentCount - r.count), 0)
+        WHEN '0' THEN
+        IFNULL((r.currentCount + r.count), 0)
+        END initCount,
+        r.currentCount,
+        r.count,
+        r.busTypeValue,
+        r.goodsSpuName,
+        r.createTime,
+        r.goodsSpuName,
+        r.goodsSkuTitle,
+        r.goodsSkuCode,
+        r.goodsSkuOwnSpec,
+        r.unit,
+        r.warehouseName,
+        r.warehouseRackCode
        FROM wms_inventory_record AS r
        <where>
            ${ew.sqlSegment}
@ -96,6 +96,8 @@
        wir.goodsSkuOwnSpec,
        wir.warehouseName,
        wir.warehouseRackCode,
+        wa.areaName wareAreaName,
+        wz.zoneName wareZoneName,
        wir.billNo,
        wir.billType,
        DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
@ -114,7 +116,10 @@
        ui.`name` createByName
        from wms_inventory_record wir
        LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid
-        LEFT JOIN wms_warehouse_info as i ON wir.warehouseSid = i.sid
+        LEFT JOIN wms_warehouse_rack as wr ON wir.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 s ON wi.useOrgSid = s.sid
        LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid
        LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid
@ -193,9 +198,9 @@

    <select id="selByGoodsID" resultType="java.lang.String">
        SELECT
-                billNo
+            billNo
        FROM
-                wms_inventory_record
+            wms_inventory_record
        WHERE billType = '0'
          AND goodsID = #{content}
    </select>
--- 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<WmsInventoryRe
        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
            qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
        }
+
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("wa.areaName", query.getWareAreaName());
+        }
+
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("wz.zoneName", query.getWareZoneName());
+        }
+
        //供应商名称
        if (StringUtils.isNotBlank(query.getSupplierName())) {
            qw.like("wir.supplierName", query.getSupplierName());
        }
+
        //来源单据编号
        if (StringUtils.isNotBlank(query.getBillNo())) {
            qw.like("wir.billNo", query.getBillNo());
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java
@ -22,6 +22,10 @@ public class WmsInventoryRecordsQuery implements Query {
    private String warehouseName;
    @ApiModelProperty("库位编号")
    private String warehouseRackCode;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
    @ApiModelProperty("厂家")
    private String manufacturerName;
    @ApiModelProperty("供应商")
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java
@ -29,6 +29,10 @@ public class WmsInventoryRecordsVo {
    private String warehouseRackCode;
    @ApiModelProperty("库区名称")
    private String warehouseAreaName;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
    @ApiModelProperty("来源单据编号")
    private String billNo;
    @ApiModelProperty("单据类型（1入库、0出库）")