From 3acbcde84f2f0e0569bdf9e39f1a8b3f4a829e34 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 21 Oct 2024 14:38:00 +0800
Subject: [PATCH] 1

---
 .../purchasebill/PurchaseBillService.java     |  6 ++++++
 .../WarehouseAnsBillNum.java                  | 20 +++++++++++++++++++
 .../WarehouseAnsBillFeign.java                |  5 +++++
 .../WarehouseAnsBillFeignFallback.java        |  6 ++++++
 4 files changed, 37 insertions(+)
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
index eb83bca..9ae0e25 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java
@@ -41,6 +41,7 @@ import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto;
 import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import com.yxt.oms.feign.goods.basebrandinfo.BaseBrandInfoFeign;
 import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign;
 import com.yxt.oms.feign.goods.basegoodsspu.BaseGoodsSpuFeign;
@@ -89,6 +90,11 @@ public class PurchaseBillService {
         pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
         pq.getParams().setIndex(dataRule.getIndex());
         PagerVo<PurchaseBillVo> p = purchaseBillFeign.listPage(pq).getData();
+        for (PurchaseBillVo record : p.getRecords()) {
+            WarehouseAnsBillNum data = warehouseAnsBillFeign.selByExternalNo(record.getBillNo()).getData();
+            record.setEnterWareCount(data.getActualInCount());
+            record.setEnterWareAmount(data.getActualInCount().multiply(data.getPrice()));
+        }
         return rb.success().setData(p);
     }
 
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java
new file mode 100644
index 0000000..02e6574
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseansbilldetail/WarehouseAnsBillNum.java
@@ -0,0 +1,20 @@
+package com.yxt.oms.biz.func.warehouseansbilldetail;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/11
+ **/
+@Data
+public class WarehouseAnsBillNum {
+
+
+    private BigDecimal actualInCount;
+    private BigDecimal price;
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
index a24e7b6..72ecaa3 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
@@ -7,6 +7,7 @@ import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -58,4 +59,8 @@ public interface WarehouseAnsBillFeign {
     @GetMapping("details")
     @ApiOperation("详情")
     ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid);
+
+    @GetMapping("selByExternalNo")
+    @ApiOperation("根据外部单号查询实际入库数量及单价")
+    ResultBean<WarehouseAnsBillNum> selByExternalNo(@RequestParam("billNo") String billNo);
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java
index 9182ddf..4ea4895 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java
@@ -7,6 +7,7 @@ import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillVo;
 import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillNum;
 import org.springframework.stereotype.Component;
 
 /**
@@ -45,4 +46,9 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign {
 	public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<WarehouseAnsBillNum> selByExternalNo(String billNo) {
+		return null;
+	}
 }
\ No newline at end of file