修改旧件库存查询问题

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java

@@ -35,12 +35,20 @@ public class WmsWarehouseRackRest {
         return wmsWarehouseRackService.listAll(pq);
     }
 
-    @ApiOperation("查询所有的库区")
+    @ApiOperation("查询所有的库位")
     @GetMapping("/getAllType")
     public ResultBean<WmsWarehouseRackVo> getAllType() {
         return wmsWarehouseRackService.getAllType();
     }
 
+
+    @ApiOperation("根据库区sid查询所有的库位")
+    @GetMapping("/getAllRackByKQSid")
+    public ResultBean<List<RackVo>> getAllRackByKQSid(@RequestParam("kqSid") String kqSid) {
+        return wmsWarehouseRackService.getAllRackByKQSid(kqSid);
+    }
+
+
     @ApiOperation("根据库区sid查询所有库位")
     @GetMapping("/getAllTypeByAreaSid")
     public ResultBean<List<WmsWarehouseRackVo>> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@@ -8,7 +8,6 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -29,8 +28,8 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
 
     WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
 
-    @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ")
-    List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
+
+    List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid,@Param("warehouseTypeValue") String warehouseTypeValue);
 
     int selectNum(@Param("billCode") String billCode);
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml

@@ -29,6 +29,13 @@
         from wms_warehouse_info
         where warehouseCode LIKE concat(#{billCode}, '%')
     </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo">
+        select * from wms_warehouse_info
+        where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1'
+        <if test="warehouseTypeValue != null and warehouseTypeValue != ''">
+           and warehouseTypeValue=#{warehouseTypeValue}
+        </if>
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_info
         SET isDelete=1

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -22,7 +22,6 @@ import com.yxt.wms.feign.portal.sysstaffinfo.StaffByRole;
 import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
-import com.yxt.wms.utils.BillNo;
 import com.yxt.wms.utils.OrgPathQuery;
 import com.yxt.wms.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,7 +127,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
                 useOrgSid = sysOrganization.getSid();
             }
         }
-        List<WmsWarehouseInfo> list = baseMapper.listAll(useOrgSid);
+        String warehouseTypeValue = "";
+        if (StringUtils.isNotBlank(query.getWarehouseTypeValue())) {
+            warehouseTypeValue = query.getWarehouseTypeValue();
+        }
+        List<WmsWarehouseInfo> list = baseMapper.listAll(useOrgSid,warehouseTypeValue);
         return rb.success().setData(list);
     }
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java

@@ -0,0 +1,11 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import lombok.Data;
+
+@Data
+public class RackVo {
+
+    String rackName;
+    String rackCode;
+
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -28,4 +26,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
     WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode);
 
     List<WmsWarehouseRackVo> getAllTypeByAreaSid(String areaSid);
+
+    List<RackVo> getAllRackByKQSid(@Param("kqSid") String kqSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml

@@ -64,4 +64,12 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0
         WHERE locationSid = #{areaSid}
         AND isDelete = 0
     </select>
+    <select id="getAllRackByKQSid" resultType="com.yxt.wms.biz.base.wmswarehouserack.RackVo">
+        SELECT
+            rackName,
+            rackCode
+        FROM wms_warehouse_rack
+        WHERE locationSid = #{kqSid}
+          AND isDelete = 0
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

@@ -12,7 +12,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
-import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone;
@@ -22,7 +21,6 @@ import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -290,4 +288,11 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         List<WmsWarehouseRackVo> wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid);
         return rb.success().setData(wmsWarehouseRackVos);
     }
+
+    public ResultBean<List<RackVo>> getAllRackByKQSid(String kqSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<RackVo> list = baseMapper.getAllRackByKQSid(kqSid);
+        return rb.success().setData(list);
+
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java

@@ -31,7 +31,7 @@ public class WmsOldInventoryExcelVo {
     private String goodsSpuName;
 
     //商品编码
-    @ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode")
+    @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode")
     private String goodsSkuCode;
 
     //厂家
@@ -47,8 +47,8 @@ public class WmsOldInventoryExcelVo {
     private String unit;
 
     //仓库
-    @ExportEntityMap(CnName = "仓库", EnName = "warehouseName")
-    private String warehouseName;
+    @ExportEntityMap(CnName = "仓库-库区", EnName = "warehouseInfo")
+    private String warehouseInfo;
 
     //库位
     @ExportEntityMap(CnName = "库位", EnName = "warehouseRackCode")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml

@@ -44,47 +44,134 @@
     </select>
 
     <select id="oldPageList" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryPageListVo">
-        SELECT wi.sid,
-        wi.goodsID,
-        wi.goodsSpuName,
-        wi.goodsSkuCode,
-        wi.goodsSkuOwnSpec,
-        wi.unit,
-        wi.warehouseName,
-        wi.warehouseRackCode,
-        wi.count inventoryCount,
-        abbv.vehMark,
-        abbv.vinNo,
-        wib.supplierName as manufacturerName
-        FROM wms_inventory wi
-        LEFT JOIN wms_inventory_batch wib
-        ON wi.sid = wib.`inventorySid`
-        LEFT JOIN yxt_4sas.as_busrepair_bill_vech abbv
-        ON wib.billSid = abbv.`billSid`
+        SELECT * FROM
+        (SELECT
+        e.*,
+        (
+        SELECT
+        IFNULL(v.vehMark,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vehMark,
+        (
+        SELECT
+        IFNULL(v.vinNo,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vinNo,
+        (
+        SELECT
+        b.billNo
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill AS b ON i.sourceBillSid = b.sid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) sourceBillNo
+        FROM
+        (
+        SELECT
+        i.count inventoryCount,
+        i.manufacturerName,
+        i.goodsID,
+        i.goodsSkuCode,
+        i.goodsSkuOwnSpec,
+        i.goodsSpuName,
+        i.unit,
+        CONCAT( i.warehouseName,'-', a.areaName) warehouseInfo,
+        i.warehouseRackCode,
+        i.sid,
+        s.orgSidPath,
+        i.createBySid
+        FROM
+        wms_inventory AS i
+        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
+        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
+        LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
+        ORDER BY i.createTime DESC
+        ) e) a
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryExcelVo">
-        select wi.sid,
-               wi.goodsID,
-               wi.goodsSpuName,
-               wi.goodsSkuCode,
-               wi.goodsSkuOwnSpec,
-               wi.unit,
-               wi.warehouseName,
-               wi.warehouseRackCode,
-               wi.count             inventoryCount,
-               (@rank := @rank + 1) rankNo,
-               abbv.vehMark,
-               abbv.vinNo,
-               wib.supplierName as manufacturerName
-        from wms_inventory wi
-        LEFT JOIN wms_inventory_batch wib
-        ON wi.sid = wib.`inventorySid`
-        LEFT JOIN yxt_4sas.as_busrepair_bill_vech abbv
-        ON wib.billSid = abbv.`billSid`,
+        SELECT a.*,(@rank := @rank + 1) rankNo FROM
+        (SELECT
+        e.*,
+        (
+        SELECT
+        IFNULL(v.vehMark,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vehMark,
+        (
+        SELECT
+        IFNULL(v.vinNo,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vinNo,
+        (
+        SELECT
+        b.billNo
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill AS b ON i.sourceBillSid = b.sid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) sourceBillNo
+        FROM
+        (
+        SELECT
+        i.count inventoryCount,
+        i.manufacturerName,
+        i.goodsID,
+        i.goodsSkuCode,
+        i.goodsSkuOwnSpec,
+        i.goodsSpuName,
+        i.unit,
+        CONCAT( i.warehouseName,'-', a.areaName) warehouseInfo,
+        i.warehouseRackCode,
+        i.sid,
+        s.orgSidPath,
+        i.createBySid
+        FROM
+        wms_inventory AS i
+        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
+        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
+        LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
+        ORDER BY i.createTime DESC
+        ) e) a,
         (SELECT @rank := 0) t
         <where>
             ${ew.sqlSegment}
@@ -102,53 +189,106 @@
     </select>
 
     <select id="recordList" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryRecordList">
-        select wir.goodsID,
-               wir.goodsSpuName,
-               wir.goodsSkuCode,
-               wir.goodsSkuOwnSpec,
-               wir.unit,
-               wir.warehouseName,
-               wir.warehouseRackCode,
-               wir.billNo,
-               wir.billType,
-               DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
-               wir.busTypeValue,
-               wir.count,
-               wir.currentCount,
-               wir.manufacturerName,
-               abbv.vinNo
-        from wms_inventory_record wir
-        LEFT JOIN wms_inventory_batch wib
-        ON wir.inventorySid = wib.`inventorySid`
-        LEFT JOIN yxt_4sas.as_busrepair_bill_vech abbv
-        ON wib.billSid = abbv.`billSid`
+        SELECT * FROM
+        (SELECT e.*,
+        (SELECT
+        IFNULL(v.vinNo,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vinNo
+        FROM
+        (SELECT
+        i.sid,
+        wir.createBySid,
+        s.orgSidPath,
+        wir.goodsID,
+        wir.goodsSpuName,
+        wir.goodsSkuCode,
+        wir.manufacturerName,
+        wir.goodsSkuOwnSpec,
+        wir.unit,
+        wir.warehouseName,
+        wir.warehouseRackCode,
+        wa.areaName warehouseAreaName,
+        wir.billNo,
+        wir.billType,
+        DATE_FORMAT( wir.createTime, '%Y-%m-%d' ) AS createTime,
+        wir.busTypeValue,
+        wir.busTypeKey,
+        wir.count,
+        wir.currentCount
+        FROM
+        wms_inventory_record wir
+        LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
+        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
+        LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
+        ORDER BY wir.createTime DESC
+        ) as e) as a
         <where>
             ${ew.sqlSegment}
         </where>
-        order by wir.createTime desc
     </select>
 
     <select id="excelRecordList"
             resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryRecordListExcelVo">
-        select wir.goodsID,
-               wir.goodsSpuName,
-               wir.goodsSkuCode,
-               wir.goodsSkuOwnSpec,
-               wir.unit,
-               wir.warehouseName,
-               wir.warehouseRackCode,
-               wir.billNo,
-               wir.billType,
-               DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
-               wir.busTypeValue,
-               wir.count,
-               wir.currentCount,
-               (@rank := @rank + 1)                       rankNo
-        from wms_inventory_record wir,
-             (SELECT @rank := 0) t
+        SELECT a.*,
+        (@rank := @rank + 1)                       rankNo
+               FROM
+        (SELECT e.*,
+        (SELECT
+        IFNULL(v.vinNo,'')
+        FROM
+        yxt_4sas.as_busrepair_inventorybill_detail AS d
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid
+        WHERE
+        d.oldInventorySid = e.sid
+        LIMIT 1
+        ) vinNo
+        FROM
+        (SELECT
+        i.sid,
+        wir.createBySid,
+        s.orgSidPath,
+        wir.goodsID,
+        wir.goodsSpuName,
+        wir.goodsSkuCode,
+        wir.manufacturerName,
+        wir.goodsSkuOwnSpec,
+        wir.unit,
+        wir.warehouseName,
+        wir.warehouseRackCode,
+        wa.areaName warehouseAreaName,
+        wir.billNo,
+        if(wir.billType = 0,'出库','入库') billType,
+        DATE_FORMAT( wir.createTime, '%Y-%m-%d' ) AS createTime,
+        wir.busTypeValue,
+        wir.busTypeKey,
+        wir.count,
+        wir.currentCount
+        FROM
+        wms_inventory_record wir
+        LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
+        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
+        LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
+        ORDER BY wir.createTime DESC
+        ) as e) as a,
+        (SELECT @rank := 0) t
         <where>
             ${ew.sqlSegment}
         </where>
-        order by wir.createTime desc
     </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java

@@ -25,6 +25,8 @@ public class WmsOldInventoryPageListQuery implements Query {
 
     //库位
     private String warehouseRackCode;
+    //库区
+    private String warehouseAreaName;
 
     //厂家
     private String manufacturerName;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordList.java

@@ -33,6 +33,7 @@ public class WmsOldInventoryRecordList {
 
     //仓库
     private String warehouseName;
+    private String warehouseAreaName;
 
     //库位
     private String warehouseRackCode;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListExcelVo.java

@@ -27,7 +27,7 @@ public class WmsOldInventoryRecordListExcelVo {
     private String goodsSpuName;
 
     //商品编码
-    @ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode")
+    @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode")
     private String goodsSkuCode;
 
     //厂家
@@ -46,6 +46,11 @@ public class WmsOldInventoryRecordListExcelVo {
     @ExportEntityMap(CnName = "仓库", EnName = "warehouseName")
     private String warehouseName;
 
+    //仓库
+    @ExportEntityMap(CnName = "库区", EnName = "warehouseAreaName")
+    private String warehouseAreaName;
+
+
     //库位
     @ExportEntityMap(CnName = "库位", EnName = "warehouseRackCode")
     private String warehouseRackCode;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListQuery.java

@@ -22,7 +22,7 @@ public class WmsOldInventoryRecordListQuery implements Query {
 
     //仓库
     private String warehouseName;
-
+    private String warehouseAreaName;
     //库位
     private String warehouseRackCode;
 
@@ -46,4 +46,8 @@ public class WmsOldInventoryRecordListQuery implements Query {
 
     //发生时间结束时间
     private String createTimeEnd;
+
+    private String orgPath;
+    private String userSid;
+    private String menuUrl;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java

@@ -13,19 +13,17 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
-import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsUpdateCountQuery;
-import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch;
-import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign;
+import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
@@ -194,36 +192,75 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     public PagerVo<WmsOldInventoryPageListVo> oldPageList(PagerQuery<WmsOldInventoryPageListQuery> pagerQuery) {
         WmsOldInventoryPageListQuery query = pagerQuery.getParams();
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setUserSid(query.getUserSid());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                PagerVo<WmsOldInventoryPageListVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<WmsOldInventoryPageListVo> p = new PagerVo<>();
+            return p;
+        }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("wi.goodsID", query.getGoodsID());
+            qw.like("a.goodsID", query.getGoodsID());
         }
         //商品名称
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("wi.goodsSpuName", query.getGoodsSpuName());
+            qw.like("a.goodsSpuName", query.getGoodsSpuName());
         }
         //仓库
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("wi.warehouseName", query.getWarehouseName());
+            qw.like("a.warehouseInfo", query.getWarehouseName());
+        }
+        //库区
+        if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
+            qw.like("a.warehouseInfo", query.getWarehouseAreaName());
         }
         //库位
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
-            qw.like("wi.warehouseRackCode", query.getWarehouseRackCode());
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
         }
         //商品编码
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("wi.goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
         }
         //ToDo:需测试时添加，待定
         //厂家
         if (StringUtils.isNotBlank(query.getManufacturerName())) {
-            qw.like("wib.supplierName", query.getManufacturerName());
+            qw.like("a.manufacturerName", query.getManufacturerName());
         }
         //车架号
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("abbv.vinNo", query.getVinNo());
+            qw.like("a.vinNo", query.getVinNo());
         }
-        qw.eq("wi.warehouseName", "旧件仓库");
         IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOldInventoryPageListVo> pagging = baseMapper.oldPageList(page, qw);
         PagerVo<WmsOldInventoryPageListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -243,33 +280,75 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     }
 
     public List<WmsOldInventoryExcelVo> listExcel(WmsOldInventoryPageListQuery query) {
+        //ToDo:添加查询条件
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setUserSid(query.getUserSid());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                return new ArrayList<>();
+            }
+        } else {
+            return new ArrayList<>();
+        }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("wi.goodsID", query.getGoodsID());
+            qw.like("a.goodsID", query.getGoodsID());
         }
         //商品名称
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("wi.goodsSpuName", query.getGoodsSpuName());
+            qw.like("a.goodsSpuName", query.getGoodsSpuName());
         }
         //仓库
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("wi.warehouseName", query.getWarehouseName());
+            qw.like("a.warehouseInfo", query.getWarehouseName());
+        }
+        //库区
+        if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
+            qw.like("a.warehouseInfo", query.getWarehouseAreaName());
         }
         //库位
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
-            qw.like("wi.warehouseRackCode", query.getWarehouseRackCode());
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
         }
         //商品编码
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("wi.goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
         }
         //ToDo:需测试时添加，待定
         //厂家
+        if (StringUtils.isNotBlank(query.getManufacturerName())) {
+            qw.like("a.manufacturerName", query.getManufacturerName());
+        }
         //车架号
-        //车牌号
-
-        qw.eq("wi.warehouseName", "旧件仓库");
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("a.vinNo", query.getVinNo());
+        }
         List<WmsOldInventoryExcelVo> list = baseMapper.listExcel(qw);
         list.removeAll(Collections.singleton(null));
         return list;
@@ -291,48 +370,91 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     public PagerVo<WmsOldInventoryRecordList> recordList(PagerQuery<WmsOldInventoryRecordListQuery> pagerQuery) {
         WmsOldInventoryRecordListQuery query = pagerQuery.getParams();
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setUserSid(query.getUserSid());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                return new PagerVo<WmsOldInventoryRecordList>();
+            }
+        } else {
+            return new PagerVo<WmsOldInventoryRecordList>();
+        }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("wir.goodsID", query.getGoodsID());
+            qw.like("a.goodsID", query.getGoodsID());
         }
         //商品名称
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("wir.goodsSpuName", query.getGoodsSpuName());
+            qw.like("a.goodsSpuName", query.getGoodsSpuName());
         }
         //仓库
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("wir.warehouseName", query.getWarehouseName());
+            qw.like("a.warehouseName", query.getWarehouseName());
         }
         //库位
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
-            qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
+            qw.like("a.warehouseAreaName", query.getWarehouseAreaName());
         }
         //商品编码
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("wir.goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
         }
         //ToDo:需测试时添加，待定
         //厂家
         if (StringUtils.isNotBlank(query.getManufacturerName())) {
-            qw.like("wir.manufacturerName", query.getManufacturerName());
+            qw.like("a.manufacturerName", query.getManufacturerName());
         }
         //车架号
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("abbv.vinNo", query.getVinNo());
+            qw.like("a.vinNo", query.getVinNo());
         }
         //来源单号
         if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("wir.billNo", query.getBillNo());
+            qw.like("a.billNo", query.getBillNo());
         }
         //单据类型
         if (StringUtils.isNotBlank(query.getBillType())) {
-            qw.like("wir.billType", query.getBillType());
+            if (query.getBillType().equals("入库")) {
+                qw.eq("a.billType",1);
+            } else if (query.getBillType().equals("出库")) {
+                qw.eq("a.billType",0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getBusTypeValue())) {
+            qw.eq("a.busTypeKey", query.getBusTypeValue());
         }
         //单据日期开始时间-单据日期结束时间
-        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
                 );
-        qw.eq("wir.warehouseName", "旧件仓库");
         IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOldInventoryRecordList> pagging = baseMapper.recordList(page, qw);
         PagerVo<WmsOldInventoryRecordList> p = PagerUtil.pageToVo(pagging, null);
@@ -341,42 +463,87 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
 
     public List<WmsOldInventoryRecordListExcelVo> excelRecordList(WmsOldInventoryRecordListQuery query) {
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setUserSid(query.getUserSid());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("a.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                return new ArrayList<>();
+            }
+        } else {
+            return new ArrayList<>();
+        }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("wir.goodsID", query.getGoodsID());
+            qw.like("a.goodsID", query.getGoodsID());
         }
         //商品名称
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("wir.goodsSpuName", query.getGoodsSpuName());
+            qw.like("a.goodsSpuName", query.getGoodsSpuName());
         }
         //仓库
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("wir.warehouseName", query.getWarehouseName());
+            qw.like("a.warehouseName", query.getWarehouseName());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
+            qw.like("a.warehouseAreaName", query.getWarehouseAreaName());
         }
         //库位
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
-            qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
         }
         //商品编码
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("wir.goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
         }
         //ToDo:需测试时添加，待定
         //厂家
+        if (StringUtils.isNotBlank(query.getManufacturerName())) {
+            qw.like("a.manufacturerName", query.getManufacturerName());
+        }
         //车架号
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("a.vinNo", query.getVinNo());
+        }
         //来源单号
         if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("wir.billNo", query.getBillNo());
+            qw.like("a.billNo", query.getBillNo());
         }
         //单据类型
         if (StringUtils.isNotBlank(query.getBillType())) {
-            qw.like("wir.billType", query.getBillType());
+            qw.eq("a.billType",query.getBillType());
+        }
+        if (StringUtils.isNotBlank(query.getBusTypeValue())) {
+            qw.eq("a.busTypeKey", query.getBusTypeValue());
         }
         //单据日期开始时间-单据日期结束时间
-        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
                 );
-        qw.eq("wir.warehouseName", "旧件仓库");
         List<WmsOldInventoryRecordListExcelVo> list = baseMapper.excelRecordList(qw);
         list.removeAll(Collections.singleton(null));
         return list;

yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java

@@ -10,4 +10,5 @@ import lombok.Data;
 @Data
 public class OrgPathQuery {
     private String orgPath;
+    private String warehouseTypeValue;
 }