Merge remote-tracking branch 'origin/master'

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -351,9 +351,9 @@ public class WmsInventoryRest {
     //------------------------------ 行政类审批查询库存 ---------------------------------------
     @ApiOperation("行政类审批查询库存")
     @PostMapping("/oaInventoryList")
-    public ResultBean<List<FormCommon>> oaInventoryList(@RequestParam("orgPath") String orgPath, @RequestParam("warehouseTypeValue") String warehouseTypeValue) {
+    public ResultBean<List<FormCommon>> oaInventoryList(@RequestParam("orgPath") String orgPath) {
         ResultBean<List<FormCommon>> rb = ResultBean.fireFail();
-        List<FormCommon> list = wmsInventoryService.oaInventoryList(orgPath, warehouseTypeValue);
+        List<FormCommon> list = wmsInventoryService.oaInventoryList(orgPath,"固定资产库");
         return rb.success().setData(list);
     }
 

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
+        wi.goodsID
         so.name useOrgName,
         s.name deptName,
         wi.goodsSpuName,

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

@@ -927,6 +927,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("a.warehouseName", query.getName())
             );
         }
+        qw.notLike("a.goodsID","-O");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<FittingsInventoryVo> pagging = baseMapper.fittingsInventory(page, qw);
         PagerVo<FittingsInventoryVo> p = PagerUtil.pageToVo(pagging, null);
@@ -984,6 +985,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("i.goodsSkuCode", query.getName())
             );
         }
+        qw.notLike("i.goodsID","-O");
         List<StorageListVo> listVos = baseMapper.appStorage(qw);
         Map<String, List<StorageListVo>> stringListMap = listVos.stream().collect(Collectors.groupingBy(StorageListVo::getTitle));
         List<StorageVo> records = new ArrayList<>();
@@ -1368,8 +1370,11 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             for (WmsInventory d : inventories) {
                 FormCommon f = new FormCommon();
                 f.setId(d.getSid());
-                f.setDictValue(d.getGoodsSpuName());
+                f.setDictValue(d.getGoodsID());
                 Map<String, Object> extra = new HashMap<>();
+                if (StringUtils.isNotBlank(d.getGoodsSpuName())) {
+                    extra.put("goodsSpuName", d.getGoodsSpuName());
+                }
                 if (null != d.getCount()) {
                     extra.put("count", d.getCount().toString());
                 }
@@ -1385,14 +1390,6 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                 if (StringUtils.isNotBlank(d.getUnit())) {
                     extra.put("unit", d.getUnit());
                 }
-                if (warehouseTypeValue.equals("招待库")) {
-                    String price = baseGoodsSkuExtendFeign.selSalesPrice(d.getGoodsSkuSid()).getData();
-                    if (StringUtils.isNotBlank(price)) {
-                        extra.put("price", price);
-                    } else {
-                        extra.put("price", "");
-                    }
-                }
                 f.setExtra(extra);
                 list.add(f);
             }