From ae450233c3edb98b7063d2dce7c5c331d177448d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 19 Aug 2024 17:51:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/apiadmin/pms/PmsPurchaseBillRest.java |  8 ---
 .../pms/PmsPurchasebackDetailRest.java        | 10 ++-
 .../PmsPurchasebackBill.java                  |  4 --
 .../PmsPurchasebackBillDetailsVo.java         |  4 --
 .../PmsPurchasebackBillDto.java               |  4 --
 .../PmsPurchasebackBillMapper.java            |  4 --
 .../PmsPurchasebackBillMapper.xml             | 24 --------
 .../PmsPurchasebackBillQuery.java             | 10 ---
 .../PmsPurchasebackBillService.java           | 23 -------
 .../PmsPurchasebackBillVo.java                | 10 ---
 .../PmsPurchasebackDetail.java                |  2 +
 .../PmsPurchasebackDetailDetailsVo.java       |  2 +
 .../PmsPurchasebackDetailDto.java             |  2 +
 .../PmsPurchasebackDetailMapper.java          |  2 +-
 .../PmsPurchasebackDetailMapper.xml           | 15 +++--
 .../PmsPurchasebackDetailService.java         |  4 +-
 .../PmsPurchaseBillMapper.java                |  2 -
 .../pmspurchasebill/PmsPurchaseBillMapper.xml | 31 ----------
 .../PmsPurchaseBillService.java               | 61 -------------------
 .../WmsInventoryBillUseOrgSidVo.java          |  9 ++-
 .../wmsinventory/WmsInventoryMapper.xml       |  7 ++-
 .../wmsinventory/WmsInventoryService.java     | 12 +++-
 .../feign/pms/PmsPurchasebackDetailFeign.java | 24 ++++++++
 23 files changed, 70 insertions(+), 204 deletions(-)
 create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java

diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java
index 927e6ee28f..8f290aeb65 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java
@@ -75,14 +75,6 @@ public class PmsPurchaseBillRest {
 		return rb.success().setData(pv);
 	}
 
-	@ApiOperation("选择原单")
-	@PostMapping("/choiceBillListPage")
-	public ResultBean<PagerVo<PmsPurchaseChoiceBillVo>> choiceBillListPage(@RequestBody PagerQuery<PmsPurchaseChoiceBillQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<PmsPurchaseChoiceBillVo> pv = pmsPurchaseBillService.choiceBillListPage(pq);
-		return rb.success().setData(pv);
-	}
-
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody PmsPurchaseBillDto dto){
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java
index 55057437a5..227530568b 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java
@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "采购退货单据明细")
 @RestController
-@RequestMapping("/apiadmin/pms/pmspurchasebackdetail")
+@RequestMapping("v1/pmspurchasebackdetail")
 public class PmsPurchasebackDetailRest {
 
 	@Autowired
@@ -86,4 +86,12 @@ public class PmsPurchasebackDetailRest {
 		PmsPurchasebackDetailDetailsVo vo = pmsPurchasebackDetailService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@ApiOperation("根据商品sid查询已退数量")
+	@GetMapping("/selNumByGoodSid/{sid}")
+	public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		String num = pmsPurchasebackDetailService.selNumByGoodSid(sid);
+		return rb.success().setData(num);
+	}
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
index 1691155a42..fc06922e01 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
@@ -56,10 +56,6 @@ public class PmsPurchasebackBill extends BaseEntity {
 
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
index 1fb0102b83..de6faa4d3a 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
@@ -71,10 +71,6 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
index 9e90306d42..34d6410688 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
@@ -63,10 +63,6 @@ public class PmsPurchasebackBillDto implements Dto {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
index 31c1cd608c..5bf2f4b4b6 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
@@ -60,9 +60,5 @@ public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBil
 
 	int updateFlowFiled(Map<String, Object> map);
 
-    int checkNodeStateBySourceBillSid(String sourceBillSid);
-
-	BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
-
 	int selectBySid(String join);
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
index f7cd3cdd1b..cad81ec0c4 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
@@ -14,17 +14,10 @@
 		ppb.`deptName`,
 		ppb.createTime,
 		ppb.`finishTime`,
-		pb.billNo AS sourceBillNo,
-		pb.`payTypeValue`,
-		pb.`purchaseReasonValue`,
-		pb.`purchaseTypeValue`,
-		pb.supplierName,
 		SUM(ppd.backAmount) AS backAmountCount,
 		ppb.receivableAmount
 		FROM
 		pms_purchaseback_bill ppb
-		LEFT JOIN pms_purchase_bill pb
-		ON ppb.`sourceBillSid` = pb.`sid`
 		LEFT JOIN pms_purchaseback_detail ppd
 		ON ppb.`sid` = ppd.`billSid`
 		LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
@@ -57,23 +50,6 @@
 		WHERE sid=#{sid}
 	</update>
 
-	<select id="checkNodeStateBySourceBillSid" resultType="int">
-		SELECT COUNT(*)
-		FROM pms_purchaseback_bill
-		WHERE sourceBillSid = #{sourceBillSid}
-		  AND nodeState != '已办结'
-		  AND nodeState != '终止'
-    </select>
-
-	<select id="checkPayableAmountBySourceBillSid" resultType="java.math.BigDecimal">
-		SELECT payableAmount
-		FROM pms_purchaseback_bill
-		WHERE sourceBillSid = #{sourceBillSid}
-		  AND nodeState = '已办结'
-		ORDER BY createTime DESC
-				LIMIT 1
-	</select>
-
 	<select id="selectBySid" resultType="int">
 		SELECT COUNT(*)
 		FROM pms_purchaseback_bill
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
index caa546d39f..3443773567 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
@@ -67,16 +67,6 @@ public class PmsPurchasebackBillQuery implements Query {
     private String finishStartTime;
     @ApiModelProperty("办结结束日期")
     private String finishEndTime;
-    @ApiModelProperty("来源单编号")
-    private String sourceBillNo;
-    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
-    private String purchaseTypeValue;
-    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
-    private String purchaseReasonValue;
-    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
-    private String payTypeValue;
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
index b3a200bed0..56713c0c0c 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
@@ -156,21 +156,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		if (StringUtils.isNotBlank(query.getBillNo())) {
 			qw.like("ppb.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getSourceBillNo())) {
-			qw.like("pb.billNo", query.getSourceBillNo());
-		}
-		if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
-			qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
-		}
-		if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
-			qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
-		}
-		if (StringUtils.isNotBlank(query.getPayTypeValue())) {
-			qw.like("pb.payTypeValue", query.getPayTypeValue());
-		}
-		if (StringUtils.isNotBlank(query.getSupplierName())) {
-			qw.like("pb.supplierName", query.getSupplierName());
-		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -202,10 +187,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		dto.setCreateOrgSid(useOrgSid);
 		dto.setCreateOrgName(organizationVo.getName());
 		if (StringUtils.isBlank(dtoSid)) {
-			int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid());
-			if (i > 0){
-				return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请");
-			}
 			//生成单据编号
 			String billNo = "";
 			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@@ -570,8 +551,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
-
-	public BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid) {
-		return baseMapper.checkPayableAmountBySourceBillSid(sourceBillSid);
-	}
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
index 0ac5eadbc7..01b1b726f5 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
@@ -69,16 +69,6 @@ public class PmsPurchasebackBillVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime;
-    @ApiModelProperty("来源单编号")
-    private String sourceBillNo;
-    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
-    private String purchaseTypeValue;
-    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
-    private String purchaseReasonValue;
-    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
-    private String payTypeValue;
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
     @ApiModelProperty("退货金额")
     private String backAmountCount;
     @ApiModelProperty("应收金额")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java
index b7aac7976b..0721f42f6d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java
@@ -56,6 +56,8 @@ public class PmsPurchasebackDetail extends BaseEntity {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java
index 285e412770..0da2ec96bd 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java
@@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDetailsVo implements Vo {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java
index 206945f072..5312f5112c 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java
@@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDto implements Dto {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java
index f27f222707..0939410ddd 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java
@@ -61,5 +61,5 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper<PmsPurchasebackD
 	@Select("select * from pms_purchaseback_detail where billSid = #{billSid}")
 	List<PmsPurchasebackDetailDetailsVo> selByMainSid(String billSid);
 
-	BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid);
+    String selNumByGoodSid(String sid);
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml
index 49007bbeaa..5da830040c 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml
@@ -7,15 +7,14 @@
 		SELECT * FROM pms_purchaseback_detail <where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="checkReturnedCount" resultType="java.math.BigDecimal">
+	<select id="selNumByGoodSid" resultType="java.lang.String">
 		SELECT
-				IFNULL(SUM(ppd.backCount), 0)
+				IFNULL(SUM(pd.backCount),0)
 		FROM
-				pms_purchaseback_detail ppd
-						LEFT JOIN pms_purchaseback_bill ppb
-						ON ppd.`billSid` = ppb.sid
-		WHERE ppd.goodsSkuSid = #{goodsSkuSid}
-		  AND ppb.`sourceBillSid` = #{sourceBillSid}
-		  AND ppb.`nodeState` = '已办结'
+				pms_purchaseback_detail pd
+						LEFT JOIN pms_purchaseback_bill pb
+						ON pd.`billSid` = pb.`sid`
+		WHERE pd.goodsSpuSid = #{sid}
+		  AND pb.nodeState = '已办结'
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java
index 057c8ef214..077336a222 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java
@@ -89,7 +89,7 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
 		return baseMapper.selByMainSid(billSid);
 	}
 
-	public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) {
-		return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid);
+	public String selNumByGoodSid(String sid) {
+		return baseMapper.selNumByGoodSid(sid);
 	}
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java
index fc4aa67153..c41f8cb91d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java
@@ -56,8 +56,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper<PmsPurchaseBill> {
 
 	IPage<PmsPurchaseBillVo> selectPageVo(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBill> qw);
 
-    IPage<PmsPurchaseChoiceBillVo> choiceBillListPage(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) QueryWrapper<PmsPurchaseBill> qw);
-
     String selectNum(String billNo);
 
     int updateFlowFiled(Map<String, Object> map);
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
index 57c23ae60a..16d44fbc0f 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
@@ -32,37 +32,6 @@
 		<where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="choiceBillListPage" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillVo">
-		SELECT
-				ppb.`sid`,
-				ppb.`createOrgName`,
-				ppb.`deptName`,
-				ppb.`finishTime`,
-				ppb.billNo,
-				ppb.`createTime`,
-				ppb.`purchaserName`,
-				ppb.`purchaseTypeValue`,
-				ppb.`purchaseReasonValue`,
-				ppb.`payTypeValue`,
-				ppb.`supplierName`,
-				IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
-				ppbi.billType,
-				ppbi.taxRate,
-				ppb.`remarks`,
-				SUM(ppbd.`amount`) AS amountCount,
-				ppb.freight,
-				ppb.discountAmount,
-				ppb.errorAmount,
-				ppb.`payableAmount`
-		FROM
-				pms_purchase_bill ppb
-						LEFT JOIN pms_purchase_bill_invoice ppbi
-						ON ppbi.`billSid` = ppb.`sid`
-						LEFT JOIN pms_purchase_bill_detail ppbd
-						ON ppbd.`billSid` = ppb.`sid`
-		<where> ${ew.sqlSegment} </where>
-	</select>
-
 	<select id="selectNum" resultType="java.lang.String">
 		select RIGHT (billNo, 4)
 		from pms_purchase_bill
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
index 6ef47217cd..93e6544fa4 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@@ -213,67 +213,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         return p;
     }
 
-    public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseChoiceBillQuery> pq) {
-        PmsPurchaseChoiceBillQuery query = pq.getParams();
-        QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
-        qw.eq("ppb.createOrgSid", query.getCreateOrgSid());
-        qw.eq("ppb.nodeState", "已办结");
-        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
-            qw.like("ppb.createOrgName", query.getCreateOrgName());
-        }
-        if (StringUtils.isNotBlank(query.getDeptName())) {
-            qw.like("ppb.deptName", query.getDeptName());
-        }
-        if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.like("ppb.createByName", query.getCreateByName());
-        }
-        if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("ppb.billNo", query.getBillNo());
-        }
-        if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
-            qw.like("ppb.purchaseTypeValue", query.getPurchaseTypeValue());
-        }
-        if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
-            qw.like("ppb.purchaseReasonValue", query.getPurchaseReasonValue());
-        }
-        if (StringUtils.isNotBlank(query.getPayTypeValue())) {
-            qw.like("ppb.payTypeValue", query.getPayTypeValue());
-        }
-        if (StringUtils.isNotBlank(query.getSupplierName())) {
-            qw.like("ppb.supplierName", query.getSupplierName());
-        }
-        if (StringUtils.isNotBlank(query.getIsInvoicing())) {
-            qw.eq("ppbi.isInvoicing", query.getIsInvoicing());
-        }
-        String createStartTime = query.getCreateStartTime();
-        String createEndTime = query.getCreateEndTime();
-        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-                );
-        String finishStartTime = query.getFinishStartTime();
-        String finishEndTime = query.getFinishEndTime();
-        qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
-                );
-        qw.groupBy("ppb.sid");
-        IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
-        IPage<PmsPurchaseChoiceBillVo> pagging = baseMapper.choiceBillListPage(page, qw);
-        for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) {
-            BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid());
-            if (money != null) {
-                record.setPayableAmount(money);
-            }
-            List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid());
-            for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) {
-                BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(), record.getSid());
-                pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount);
-            }
-            record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
-        }
-        PagerVo<PmsPurchaseChoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
     public String saveOrUpdateDto(PmsPurchaseBillDto dto) {
         String dtoSid = dto.getSid();
         PmsPurchasePayDto purchasePay = dto.getPurchasePay();
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java
index 848ec51f91..1ad784f59f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java
@@ -18,7 +18,7 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     @ApiModelProperty("商品ID")
     private String goodsID;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
@@ -47,6 +47,8 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
+    @ApiModelProperty("采购订单sid")
+    private String manufactorBillSid;
     @ApiModelProperty("厂家订单号")
     private String manufactorBillNo;
     @ApiModelProperty("厂家sid")
@@ -57,4 +59,9 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     private String supplierSid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
+
+    @ApiModelProperty("已退数量")
+    private BigDecimal returnedCount;
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
index f93c962018..53118dddcf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
@@ -371,10 +371,11 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidVo">
         SELECT
                 w.*,
-                p.supplierSid,
-                p.supplierName,
+                w.billObjSid AS supplierSid,
+                w.billObjName AS supplierName,
                 wa.sid AS warehouseAreaSid,
-                wa.`areaName` AS warehouseArea
+                wa.`areaName` AS warehouseArea,
+                p.sid AS manufactorBillSid
         FROM wms_inventory w
                      LEFT JOIN yxt_pms.pms_purchase_bill p
                 ON w.manufactorBillNo = p.manufacturersOrderNumber
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 512bff8639..7436e8e1a6 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -20,6 +20,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
 import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.wms.feign.pms.PmsPurchasebackDetailFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
@@ -37,8 +38,6 @@ import java.util.*;
 @Service
 public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper, WmsInventory> {
 
-    @Autowired
-    private WmsInventoryBillService wmsInventoryBillService;
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
     @Autowired
@@ -46,6 +45,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    private PmsPurchasebackDetailFeign pmsPurchasebackDetailFeign;
+    @Autowired
     private WmsWarehouseRackService wmsWarehouseRackService;
 
     public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
@@ -589,7 +590,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             qw.like("w.warehouseRackCode", query.getWarehouseRackCode());
         }
         if (StringUtils.isNotBlank(query.getSupplierName())) {
-            qw.like("p.supplierName", query.getSupplierName());
+            qw.like("w.billObjName", query.getSupplierName());
         }
         if (StringUtils.isNotBlank(query.getManufacturerName())) {
             qw.like("w.manufacturerName", query.getManufacturerName());
@@ -603,6 +604,11 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         qw.apply("w.count > 0");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryBillUseOrgSidVo> pagging = baseMapper.selInvenGoodsByUseOrgSid(page, qw);
+        for (WmsInventoryBillUseOrgSidVo record : pagging.getRecords()) {
+            String num = pmsPurchasebackDetailFeign.selNumByGoodSid(record.getGoodsSpuSid()).getData();
+            record.setReturnedCount(new BigDecimal(num));
+            record.setAmount(record.getCount().multiply(record.getCost()));
+        }
         PagerVo<WmsInventoryBillUseOrgSidVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java
new file mode 100644
index 0000000000..84e0d6f4b2
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java
@@ -0,0 +1,24 @@
+package com.yxt.wms.feign.pms;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+        contextId = "yxt-pms-PmsPurchasebackDetail",
+        name = "yxt-pms",
+        path = "v1/pmspurchasebackdetail"
+      )
+public interface PmsPurchasebackDetailFeign {
+
+      @ApiOperation("根据商品sid查询已退数量")
+      @GetMapping("/selNumByGoodSid/{sid}")
+      public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid);
+}