From 73acdfdd176926ef77d9f2d6163079352f783ae6 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Fri, 25 Apr 2025 14:05:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WmsInventoryCheckbillService.java           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
index a11d46e849..391b7384cf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
@@ -243,6 +243,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
             qw.like("d.goodsSkuCode", query.getGoodsSkuCode());
         }
+        qw.groupBy("d.sid");
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailGoodPageListVo> pagging = baseMapper.detailGoodPageList(page, qw);
         PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -318,7 +319,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
                 //查询本部门下，库存数量大0并且是旧件的库存
                 wmsInventories = wmsInventoryService.selJJByDeptSid(dto.getDeptSid());
             }
-        }else if ("03".equals(dto.getWarehouseTypeKey())){//拆件
+        } else if ("03".equals(dto.getWarehouseTypeKey())) {//拆件
             billNo = "CJPD" + sysOrganizationVo.getOrgCode() + date;
             if ("1".equals(dto.getCheckTypeKey())) {
                 //查询本部门指定库位下，库存数量大0并且拆件的库存
@@ -503,11 +504,11 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         }
         map.put("area", area);
         InputStream inputStream = null;
-        if ("01".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())){
+        if ("01".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())) {
             inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "pdbg" + ".ftl");
-        }else if ("02".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())){
+        } else if ("02".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())) {
             inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "jjpdbg" + ".ftl");
-        }else if ("03".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())){
+        } else if ("03".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())) {
             inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cj" + ".ftl");
         }
         //生成word文件名
@@ -958,12 +959,12 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         wmsInventoryCheckbillReportService.saveReport(billSid, remarks);
     }
 
-    public List<InventoryBillVo> selPyByDeptSid(String deptSid,String warehouseTypeKey) {
-        return baseMapper.selPyByDeptSid(deptSid,warehouseTypeKey);
+    public List<InventoryBillVo> selPyByDeptSid(String deptSid, String warehouseTypeKey) {
+        return baseMapper.selPyByDeptSid(deptSid, warehouseTypeKey);
     }
 
-    public List<InventoryBillVo> selPkByDeptSid(String deptSid,String warehouseTypeKey) {
-        return baseMapper.selPkByDeptSid(deptSid,warehouseTypeKey);
+    public List<InventoryBillVo> selPkByDeptSid(String deptSid, String warehouseTypeKey) {
+        return baseMapper.selPkByDeptSid(deptSid, warehouseTypeKey);
     }
 
     public ResultBean<String> getToDoNum(WmsToDoNumQuery wmsToDoNumQuery) {