From 44f84da5fd12416007c92a22f0fcf57a6e916c1a Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 18 Apr 2025 17:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusrepairInfo.java                        | 12 ++++++++++++
 .../AsBusrepairInventorybillMapper.java       |  6 ++----
 .../AsBusrepairInventorybillMapper.xml        | 13 +++++++++++++
 .../AsBusrepairInventorybillRest.java         |  5 ++++-
 .../AsBusrepairInventorybillService.java      | 10 ++++++++++
 .../WmsOldInventoryService.java               | 19 +++++++++++++++++++
 .../as/AsBusrepairInventorybillFeign.java     |  2 ++
 .../com/yxt/wms/feign/as/BusrepairInfo.java   | 12 ++++++++++++
 8 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/BusrepairInfo.java
 create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/BusrepairInfo.java

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/BusrepairInfo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/BusrepairInfo.java
new file mode 100644
index 0000000000..75e37096c1
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/BusrepairInfo.java
@@ -0,0 +1,12 @@
+package com.yxt.anrui.as.api.asbusrepairinventorybill;
+
+import lombok.Data;
+
+@Data
+public class BusrepairInfo {
+
+    private String sourceBillSid;
+    private String billNo;
+    private String preBillNo;
+    private String preBillSid;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java
index 02d8042720..fd97b2aaba 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java
@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
-import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairBillVo;
-import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill;
-import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo;
-import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairinventoryExportVo;
+import com.yxt.anrui.as.api.asbusrepairinventorybill.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,4 +36,5 @@ public interface AsBusrepairInventorybillMapper extends BaseMapper<AsBusrepairIn
     List<AsBusrepairinventoryExportVo> exportExcel(@Param(Constants.WRAPPER)QueryWrapper<AsBusrepairInventorybill> qw);
 
     IPage<AsBusrepairBillVo> listPage(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
+    BusrepairInfo getInventoryInfo(String sid);
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml
index 8c338993b3..696c52a1ec 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml
@@ -101,4 +101,17 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getInventoryInfo" resultType="com.yxt.anrui.as.api.asbusrepairinventorybill.BusrepairInfo">
+        SELECT
+            d.sid preBillSid,
+            i.sourceBillSid,
+            i.billNo as preBillNo,
+            b.billNo
+        FROM
+            as_busrepair_inventorybill_detail AS d
+                LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
+                LEFT JOIN as_busrepair_bill as b ON i.sourceBillSid = b.sid
+        WHERE d.sid = #{sid}
+    </select>
 </mapper>
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java
index 01dfb346fd..bd11586653 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java
@@ -112,5 +112,8 @@ public class AsBusrepairInventorybillRest {
         ExportExcelUtils.export(fileNameURL, list, AsBusrepairinventoryExportVo.class, response);
     }
 
-
+    @GetMapping("/getInventoryInfo")
+    ResultBean<BusrepairInfo> getInventoryInfo(@RequestParam("sid") String sid) {
+        return asBusrepairInventorybillService.getInventoryInfo(sid);
+    }
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
index 5117cf4139..ccf2cc0cec 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
@@ -445,6 +445,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setBillType("0");
                         recordDto.setBusTypeKey("11");
                         recordDto.setBusTypeValue("销售出库");
+                        recordDto.setPreBillNo(entity.getBillNo());
+                        recordDto.setPreBillSid(detail.getSid());
                         BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                         recordDto.setCount(sDto.getCount());
                         recordDto.setCurrentCount(subtractCount.toString());
@@ -475,6 +477,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setBillType("1");
                         recordDto.setBusTypeKey("02");
                         recordDto.setBusTypeValue("退货入库");
+                        recordDto.setPreBillNo(entity.getBillNo());
+                        recordDto.setPreBillSid(detail.getSid());
                         BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                         recordDto.setCount(sDto.getCount());
                         recordDto.setCurrentCount(add.toString());
@@ -855,4 +859,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         asBusrepairBillNodeService.insert(billNode);
         return rb.success();
     }
+
+    public ResultBean<BusrepairInfo> getInventoryInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusrepairInfo busrepairInfo = baseMapper.getInventoryInfo(sid);
+        return rb.success();
+    }
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
index c6c68fb8da..3251ad7b77 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
@@ -19,6 +19,8 @@ import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsUpdateCountQuery;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
+import com.yxt.wms.feign.as.AsBusrepairInventorybillFeign;
+import com.yxt.wms.feign.as.BusrepairInfo;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
@@ -46,6 +48,8 @@ import java.util.List;
 @Service
 public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMapper, WmsOldInventory> {
 
+    @Autowired
+    private AsBusrepairInventorybillFeign asBusrepairInventorybillFeign;
     @Autowired
     private WmsInventoryService wmsInventoryService;
     @Autowired
@@ -157,6 +161,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setUseOrgSid(useOrgSid);
                 kcSid = wmsInventoryService.saveWmsInventory(dto).getData();
             }
+            String sid = wmsBusrepairInventorybillDetailOld.getSid();
             //生成出入库记录
             WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
             wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
@@ -165,6 +170,13 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setBillType("1");
             wmsInventoryRecord.setBusTypeKey("09");
             wmsInventoryRecord.setBusTypeValue("其他入库");
+            BusrepairInfo busrepairInfo = asBusrepairInventorybillFeign.getInventoryInfo(sid).getData();
+            if (null != busrepairInfo) {
+                wmsInventoryRecord.setSourceBillSid(busrepairInfo.getSourceBillSid());
+                wmsInventoryRecord.setBillNo(busrepairInfo.getBillNo());
+                wmsInventoryRecord.setPreBillNo(busrepairInfo.getPreBillNo());
+                wmsInventoryRecord.setPreBillSid(busrepairInfo.getPreBillSid());
+            }
             wmsInventoryRecord.setManufacturerName(wmsBusrepairInventorybillDetailOld.getManufacturerName());
             wmsInventoryRecord.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid());
             wmsInventoryRecord.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName());
@@ -613,6 +625,13 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             }
             //生成出入库记录
             WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
+            BusrepairInfo busrepairInfo = asBusrepairInventorybillFeign.getInventoryInfo(asBusrepairInventorybillDetail.getSid()).getData();
+            if (null != busrepairInfo) {
+                wmsInventoryRecord.setSourceBillSid(busrepairInfo.getSourceBillSid());
+                wmsInventoryRecord.setBillNo(busrepairInfo.getBillNo());
+                wmsInventoryRecord.setPreBillNo(busrepairInfo.getPreBillNo());
+                wmsInventoryRecord.setPreBillSid(busrepairInfo.getPreBillSid());
+            }
             wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
             wmsInventoryRecord.setInventorySid(kcSid);
             wmsInventoryRecord.setSourceBillSid(asBusrepairBill.getSid());
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java
index dbdc6a6b00..7e8e7ebb4e 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java
@@ -28,4 +28,6 @@ public interface AsBusrepairInventorybillFeign {
 
     @GetMapping("/fetchBySid")
     ResultBean<AsBusrepairInventorybill> fetchBySid(@RequestParam("sid") String sid);
+    @GetMapping("/getInventoryInfo")
+    ResultBean<BusrepairInfo> getInventoryInfo(@RequestParam("sid") String sid);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/BusrepairInfo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/BusrepairInfo.java
new file mode 100644
index 0000000000..2c8248bf11
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/BusrepairInfo.java
@@ -0,0 +1,12 @@
+package com.yxt.wms.feign.as;
+
+import lombok.Data;
+
+@Data
+public class BusrepairInfo {
+
+    private String sourceBillSid;
+    private String billNo;
+    private String preBillNo;
+    private String preBillSid;
+}