From 75a4725945a8af12cf428f980ecea8a20ab5686e Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 14 Feb 2025 08:50:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml   | 1 +
 .../yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java | 2 ++
 2 files changed, 3 insertions(+)

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 2c8a21c73c..547f863eb6 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
@@ -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,
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 20f38fad1a..c21cd4c283 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
@@ -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<>();

From 7741153f31a771a3ccdcd4072586465ad77e64d5 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 14 Feb 2025 09:03:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/apiadmin/inventroy/WmsInventoryRest.java    |  4 ++--
 .../inventory/wmsinventory/WmsInventoryService.java | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
index 066a5a43c1..402c11b259 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
+++ b/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);
     }
 
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 72e47f5f6e..c2d1649b8a 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
@@ -1370,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());
                 }
@@ -1387,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);
             }