修改配件库存查询

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -439,6 +439,7 @@
     <select id="fittingsInventory" resultType="com.yxt.wms.biz.inventory.wmsinventory.FittingsInventoryVo">
         SELECT * FROM (
         SELECT
+        i.warehouseTypeValue,
         wi.goodsID,
         so.name useOrgName,
         s.name deptName,
@@ -453,6 +454,7 @@
         s.orgSidPath
         FROM
         wms_inventory as wi
+        LEFT JOIN wms_warehouse_info AS i ON wi.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

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -928,6 +928,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             );
         }
         qw.notLike("a.goodsID","-O");
+        qw.eq("a.warehouseTypeValue","配件库");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<FittingsInventoryVo> pagging = baseMapper.fittingsInventory(page, qw);
         PagerVo<FittingsInventoryVo> p = PagerUtil.pageToVo(pagging, null);