修改维修退料初始化

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java

@@ -28,4 +28,6 @@ public interface AsBusrepairInventorybillMapper extends BaseMapper<AsBusrepairIn
     String selOutBoundCount(@Param("sourceBillSid") String sourceBillSid, @Param("busTypeKey")String busTypeKey, @Param("goodsID")String goodsID);
 
     int selectNum(String bill);
+
+    String selOutBoundCountBySitemSid(@Param("sourceBillSid")String sourceBillSid, @Param("busTypeKey")String busTypeKey, @Param("goodsID")String goodsID, @Param("sitemSid")String sitemSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@@ -32,4 +32,13 @@
         from as_busrepair_inventorybill
         where billNo LIKE concat(#{bill}, '%')
     </select>
+    <select id="selOutBoundCountBySitemSid" resultType="java.lang.String">
+        SELECT IFNULL(SUM(d.count), 0)
+        FROM as_busrepair_inventorybill_detail AS d
+                 LEFT JOIN as_busrepair_inventorybill AS b ON d.billSid = b.sid
+        WHERE d.goodsID = #{goodsID}
+          AND b.sourceBillSid = #{sourceBillSid}
+          AND b.busTypeKey = #{busTypeKey}
+            and d.sitemSid = #{sitemSid}
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -423,7 +423,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                 vo.setSitemVoList(sitemsVos);
             }
             List<AsBusrepairInventorybillDetailSDto> list = new ArrayList<>();
-            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid);
+            //List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid);
+            List<AsBusrepairInventorybillDetail> goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSidForBack(sid);
             if (!goodsDetails.isEmpty()) {
                 for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                     AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto();
@@ -446,4 +447,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         String count = baseMapper.selOutBoundCount(sourceBillSid, busTypeKey, goodsID);
         return rb.success().setData(count);
     }
+
+    public ResultBean<String> selOutBoundCountBySitemSid(String sourceBillSid, String busTypeKey, String goodsID, String sitemSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String count = baseMapper.selOutBoundCountBySitemSid(sourceBillSid, busTypeKey, goodsID,sitemSid);
+        return rb.success().setData(count);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java

@@ -21,4 +21,6 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper<AsBusre
     List<AsBusrepairInventorybillDetail> getDetailsByBillSid(@Param("busRepairBillSid") String busRepairBillSid,@Param("busTypeKey")String busTypeKey);
 
     List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSid(@Param("sid") String sid);
+
+    List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSidForBack(@Param("sid") String sid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -29,4 +29,16 @@
         WHERE b.sourceBillSid = #{sid}
         GROUP BY d.goodsID
     </select>
+    <select id="getGoodsDetailsByBillSidForBack"
+            resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
+        SELECT
+            d.*
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
+        WHERE
+            b.sourceBillSid = #{sid}
+        GROUP BY
+            d.goodsID,d.sitemSid
+    </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java

@@ -54,4 +54,18 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
         }
         return list;
     }
+
+    public List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSidForBack(String sid) {
+        List<AsBusrepairInventorybillDetail> list = baseMapper.getGoodsDetailsByBillSidForBack(sid);
+        if (!list.isEmpty()) {
+            for (AsBusrepairInventorybillDetail record : list) {
+                //维修出入库查询已出库数量
+                String chuKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "0", record.getGoodsID(),record.getSitemSid()).getData();
+                String ruKuCount = asBusrepairInventorybillService.selOutBoundCountBySitemSid(sid, "1", record.getGoodsID(),record.getSitemSid()).getData();
+                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
+                record.setCount(count);
+            }
+        }
+        return list;
+    }
 }