From fde48f16cbafed49a5fbf3d5c7f742fae4aa5d51 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 13 Feb 2025 10:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../as/biz/asbusrepairbill/AsBusrepairBillMapper.java  |  2 +-
 .../as/biz/asbusrepairbill/AsBusrepairBillMapper.xml   |  1 +
 .../as/biz/asbusrepairbill/AsBusrepairBillService.java |  7 ++++++-
 .../inventory/wmsshelfbill/WmsShelfBillService.java    | 10 ++++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
index 8e41f5fa35..9feab10bb4 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
@@ -54,7 +54,7 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
 
     IPage<GoodsReceiveVo> notConfirmList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
 
-    List<GoodsReceiveListVo> selGoodsReceiveByBillSid(@Param("sid") String sid);
+    List<GoodsReceiveListVo> selGoodsReceiveByBillSid(@Param("sid") String sid,@Param("userSid")String userSid);
 
     IPage<GoodsConfrimListVo> notConfirmList2(IPage<AsBusrepairBill> page,@Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
 
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
index d97fce953a..10d9033fca 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@@ -264,6 +264,7 @@
                  LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
         WHERE d.state = 1
           and i.sourceBillSid = #{sid}
+            and d.operUserSid =#{userSid}
     </select>
     <select id="notConfirmList2" resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimListVo">
         SELECT
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 1c297497ce..f6b83873a0 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -535,9 +535,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     List<String> partsSellers = goodsVo.getPartsSellers();
                     if (!partsSellersSids.isEmpty()) {
                         goods.setPartsSellersSid(String.join(",", partsSellersSids));
+                    } else {
+                        goods.setPartsSellersSid("");
                     }
                     if (!partsSellers.isEmpty()) {
                         goods.setPartsSellers(String.join(",", partsSellers));
+                    } else {
+                        goods.setPartsSellers("");
                     }
                     asBusrepairInventorybillDetailService.updateById(goods);
                 }
@@ -2100,6 +2104,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     public PagerVo<GoodsReceiveVo> notConfirmList(PagerQuery<GoodsReceiveQuery> pagerQuery) {
         GoodsReceiveQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        String userSid = query.getUserSid();
         if (query != null) {
             //工单编号
             if (StringUtils.isNotBlank(query.getUserSid())) {
@@ -2121,7 +2126,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             for (GoodsReceiveVo record : records) {
                 if (null != record) {
                     if (StringUtils.isNotBlank(record.getSid())) {
-                        List<GoodsReceiveListVo> list = baseMapper.selGoodsReceiveByBillSid(record.getSid());
+                        List<GoodsReceiveListVo> list = baseMapper.selGoodsReceiveByBillSid(record.getSid(),userSid);
                         if (!list.isEmpty()) {
                             record.setList(list);
                         }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
index cd30fbebed..7fa4ee17a5 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
@@ -728,11 +728,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         if (!goodsList.isEmpty()) {
             Map<String, BigDecimal> map = new HashMap<>();
             for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto detailsDto : goodsList) {
-                BigDecimal decimal = map.get(detailsDto.getGoodsID());
+                WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, detailsDto.getGoodsID());
+                String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
+                BigDecimal decimal = map.get(goodsSkuCode);
                 if (null != decimal) {
-                    map.put(detailsDto.getGoodsID(), decimal.add(new BigDecimal(detailsDto.getCount())));
+                    map.put(goodsSkuCode, decimal.add(new BigDecimal(detailsDto.getCount())));
                 } else {
-                    map.put(detailsDto.getGoodsID(), new BigDecimal(detailsDto.getCount()));
+                    map.put(goodsSkuCode, new BigDecimal(detailsDto.getCount()));
                 }
             }
             for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto r : goodsList) {
@@ -752,7 +754,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                     actualCount = shelfBillGoods.getActualCount();
                 }
                 BigDecimal subtract = shelfBillGoods.getCount().subtract(actualCount);
-                if (subtract.compareTo(map.get(goodsID)) < 0) {
+                if (subtract.compareTo(map.get(goodsSkuCode)) < 0) {
                     return rb.setMsg("请勿超过商品上架最大数量");
                 }
             }