1

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -25,6 +25,7 @@
         bvoa.mobile,
         bvo.materialName,
         bvo.materialCode,
+        bvo.materialSid,
         bvo.giftsDescription,
         bvo.salesAllowance,
         bvo.middleOne,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -235,6 +235,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
                 List<String> ysSids = finUncollectedReceivablesDetailedFeign.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid()).getData();
                 for (String ysSid : ysSids) {
                     FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(ysSid).getData();
+                    if (data != null){
                         BigDecimal currentReceivableMoney = data.getCurrentReceivableMoney();
                         BigDecimal subscriptionMoney = data.getSubscriptionMoney();
                         BigDecimal decimal = currentReceivableMoney.subtract(subscriptionMoney);
@@ -256,6 +257,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
                             record.setQkDate(betweenDay * j * -1);
                         }
                     }
+                }
             } else {
                 record.setCkType("正常出库");
                 record.setQkDate(Long.parseLong("0"));

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailDetailsVo.java

@@ -25,33 +25,23 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.wms.inventoryprofitout;
 
-
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
+import java.math.BigDecimal;
- * Project: yxt-wms(盘库) <br/>
+
- * File: WmsInventoryProfitinDetailVo.java <br/>
- * Class: com.yxt.wms.api.wmsinventoryprofitindetail.WmsInventoryProfitinDetailVo <br/>
- * Description: 盘盈入库-明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-07 16:58:17 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
-@ApiModel(value = "盘盈入库-明细 视图数据详情", description = "盘盈入库-明细 视图数据详情")
+@ApiModel(value = "盘亏出库-明细 视图数据详情", description = "盘亏出库-明细 视图数据详情")
 public class AppInventoryProfitoutDetailDetailsVo implements Vo {
 
     private String sid; // sid
 
 	@ApiModelProperty("主表sid")
-    private String mainSid;
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
     @ApiModelProperty("图号")
     private String goodsCode;
     @ApiModelProperty("商品spuSid")
@@ -64,23 +54,26 @@ public class AppInventoryProfitoutDetailDetailsVo implements Vo {
     private String goodsName;
     @ApiModelProperty("规格")
     private String goodsSpec;
-    @ApiModelProperty("入库数量(默认盘盈数量)")
-    private String inStorageNum;
     @ApiModelProperty("入库单价")
     private String inStoragePrice;
-    @ApiModelProperty("盘盈数量")
+    @ApiModelProperty("盘亏数量")
-    private String pyNum;
+    private String pkNum;
     @ApiModelProperty("厂家sid")
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
     @ApiModelProperty("单位")
     private String unit; // 单位
-    @ApiModelProperty("供应商sid")
+    @ApiModelProperty("仓库sid")
-    private String supplierSid; // 供应商sid
+    private String warehouseSid; // 仓库sid
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("仓库名称")
-    private String supplierName; // 供应商名称
+    private String warehouseName; // 仓库名称
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("出库数量")
+    private BigDecimal outStorageNum; // 出库数量
 
     private String money;
-
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitout/AppInventoryProfitoutDetailsVo.java

@@ -35,7 +35,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-@ApiModel(value = "盘盈入库申请 视图数据详情", description = "盘盈入库申请 视图数据详情")
+@ApiModel(value = "盘亏出库申请 视图数据详情", description = "盘亏出库申请 视图数据详情")
 public class AppInventoryProfitoutDetailsVo implements Vo {
 
     private String sid; // sid
@@ -56,7 +56,7 @@ public class AppInventoryProfitoutDetailsVo implements Vo {
     @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
     @ApiModelProperty("业务类型")
-    private String businessVaule; // 业务类型
+    private String businessValue; // 业务类型
     @ApiModelProperty("盘点单sid")
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitout/WmsInventoryProfitoutService.java

@@ -30,8 +30,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailDetailsVo;
 import com.yxt.anrui.terminal.api.wms.inventoryprofitout.AppInventoryProfitoutDetailsVo;
+import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.AppDelegateQuery;
 import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutDto;
 import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutQuery;
 import com.yxt.anrui.terminal.api.wms.inventoryprofitout.flowable.InventOutTaskQuery;
@@ -43,6 +44,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Collections;
 import java.util.List;
 
@@ -61,6 +64,10 @@ public class WmsInventoryProfitoutService {
         WmsInventoryProfitoutDetailsVo data = wmsInventoryProfitoutFeign.fetchDetailsBySid(sid).getData();
         AppInventoryProfitoutDetailsVo appInventoryProfitoutDetailsVo = new AppInventoryProfitoutDetailsVo();
         BeanUtil.copyProperties(data,appInventoryProfitoutDetailsVo);
+        List<AppInventoryProfitoutDetailDetailsVo> goodsList = appInventoryProfitoutDetailsVo.getGoodsList();
+        for (AppInventoryProfitoutDetailDetailsVo appInventoryProfitoutDetailDetailsVo : goodsList) {
+            appInventoryProfitoutDetailDetailsVo.setMoney(appInventoryProfitoutDetailDetailsVo.getOutStorageNum().multiply(new BigDecimal(appInventoryProfitoutDetailDetailsVo.getInStoragePrice())).setScale(2, RoundingMode.HALF_UP).toString());
+        }
         return rb.success().setData(appInventoryProfitoutDetailsVo);
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@@ -89,4 +89,23 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     @ApiModelProperty("接收时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date receivedTime;
+
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("旧件ID")
+    private String oldGoodsID;
+    @ApiModelProperty("旧件图号")
+    private String oldGoodsSkuCode;
+    @ApiModelProperty("库存sid")
+    private String oldInventorySid;
+    @ApiModelProperty("成本价")
+    private BigDecimal cost;
+    @ApiModelProperty("成本合计")
+    private BigDecimal costTotal;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java

@@ -57,17 +57,29 @@ public class AsOldparthandle extends BaseEntity {
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
 	@ApiModelProperty("商品ID")
-    private String goodsSkuId; // 商品ID
+    private String goodsID; // 商品ID
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spuSid")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
-    @ApiModelProperty("供应商")
-    private String supplierName;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
 	@ApiModelProperty("单位")
     private String unit; // 单位
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 	@ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
 	@ApiModelProperty("仓库名称")
@@ -78,5 +90,6 @@ public class AsOldparthandle extends BaseEntity {
     private String warehouseRackCode; // 库位编码
 	@ApiModelProperty("数量")
     private BigDecimal count; // 数量
-
+    @ApiModelProperty("收益金额")
+    private BigDecimal profit;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java

@@ -58,17 +58,29 @@ public class AsOldparthandleDetailsVo implements Vo {
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("商品ID")
-    private String goodsSkuId; // 商品ID
+    private String goodsID; // 商品ID
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spuSid")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
-    @ApiModelProperty("供应商")
-    private String supplierName;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     @ApiModelProperty("单位")
     private String unit; // 单位
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 	@ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
 	@ApiModelProperty("仓库名称")
@@ -79,5 +91,6 @@ public class AsOldparthandleDetailsVo implements Vo {
     private String warehouseRackCode; // 库位编码
 	@ApiModelProperty("数量")
     private BigDecimal count; // 数量
-
+    @ApiModelProperty("收益金额")
+    private BigDecimal profit;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java

@@ -58,17 +58,29 @@ public class AsOldparthandleDto implements Dto {
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("商品ID")
-    private String goodsSkuId; // 商品ID
+    private String goodsID; // 商品ID
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spuSid")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuSid;
+    @ApiModelProperty("商品spu名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
-    @ApiModelProperty("供应商")
-    private String supplierName;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     @ApiModelProperty("单位")
     private String unit; // 单位
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 	@ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
 	@ApiModelProperty("仓库名称")
@@ -79,5 +91,6 @@ public class AsOldparthandleDto implements Dto {
     private String warehouseRackCode; // 库位编码
 	@ApiModelProperty("数量")
     private BigDecimal count; // 数量
-
+    @ApiModelProperty("收益金额")
+    private BigDecimal profit;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java

@@ -54,7 +54,7 @@ public class AsOldparthandleApplyQuery implements Query {
     @ApiModelProperty("分公司名称")
     private String useOrgName;
     @ApiModelProperty("申请部门")
-    private String deptName;
+    private String createDeptName;
     @ApiModelProperty("申请人")
     private String createByName;
     @ApiModelProperty("单据编号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java

@@ -73,6 +73,8 @@ public class AsOldparthandleApplyVo implements Vo {
     private String handleReasonValue;
     @ApiModelProperty("处理方式value")
     private String handleModeValue;
+    @ApiModelProperty("收益总额")
+    private String profitTotal;
 	@ApiModelProperty("流程定义的id")
     private String procDefId;
 	@ApiModelProperty("流程实例的sid")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturn.java

@@ -56,16 +56,30 @@ public class AsOldpartreturn extends BaseEntity {
     private String mainSid;
     @ApiModelProperty("车架号")
     private String vinNo;
-    @ApiModelProperty("厂家")
+    @ApiModelProperty("商品spuSid")
-    private String manufacturerName;
+    private String goodsSpuSid;
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spu名称")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     @ApiModelProperty("单位")
-    private String unit; // 单位
+    private String unit;
+    @ApiModelProperty("维修单号")
+    private String sourceBillNo;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("是否迟返(1是0否)")
+    private String isCf;
 	@ApiModelProperty("需返厂数量")
     private BigDecimal needReturnCount; // 需返厂数量
 	@ApiModelProperty("实际返厂数量")

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.as.api.asoldpartreturn;
 
 
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * Project: anrui-as(旧件返厂) <br/>
@@ -59,19 +61,32 @@ public class AsOldpartreturnDetailsVo implements Vo {
     private String mainSid;
     @ApiModelProperty("车架号")
     private String vinNo;
-    @ApiModelProperty("厂家")
+    @ApiModelProperty("商品spuSid")
-    private String manufacturerName;
+    private String goodsSpuSid;
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spu名称")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     @ApiModelProperty("单位")
-    private String unit; // 单位
+    private String unit;
+    @ApiModelProperty("维修单号")
+    private String sourceBillNo;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("是否迟返(1是0否)")
+    private String isCf;
 	@ApiModelProperty("需返厂数量")
     private BigDecimal needReturnCount; // 需返厂数量
 	@ApiModelProperty("实际返厂数量")
     private BigDecimal actualReturnCount; // 实际返厂数量
-
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDto.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.as.api.asoldpartreturn;
 
 
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo;
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * Project: anrui-as(旧件返厂) <br/>
@@ -59,19 +61,32 @@ public class AsOldpartreturnDto implements Dto {
     private String mainSid;
     @ApiModelProperty("车架号")
     private String vinNo;
-    @ApiModelProperty("厂家")
+    @ApiModelProperty("商品spuSid")
-    private String manufacturerName;
+    private String goodsSpuSid;
-	@ApiModelProperty("商品名称")
+    @ApiModelProperty("商品spu名称")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle;
     @ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
+    private String goodsSkuCode;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("厂家sid")
+    private String manufacturerSid;
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     @ApiModelProperty("单位")
-    private String unit; // 单位
+    private String unit;
+    @ApiModelProperty("维修单号")
+    private String sourceBillNo;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("是否迟返(1是0否)")
+    private String isCf;
 	@ApiModelProperty("需返厂数量")
     private BigDecimal needReturnCount; // 需返厂数量
 	@ApiModelProperty("实际返厂数量")
     private BigDecimal actualReturnCount; // 实际返厂数量
-
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnExcelInfo.java

@@ -8,8 +8,6 @@ import java.math.BigDecimal;
 @Data
 public class AsOldpartreturnExcelInfo {
 
-    @ApiModelProperty("车架号")
-    private String vinNo;
     @ApiModelProperty("商品名称")
     private String goodsSkuName;
     @ApiModelProperty("图号")
@@ -18,4 +16,8 @@ public class AsOldpartreturnExcelInfo {
     private String manufacturerName;
     @ApiModelProperty("需返厂数量")
     private BigDecimal needReturnCount;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetail.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asoldpartreturndetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-as(旧件) <br/>
+ * File: AsOldpartreturnDetail.java <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetail <br/>
+ * Description: 返厂旧件列表明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-23 09:18:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "返厂旧件列表明细", description = "返厂旧件列表明细")
+@TableName("as_oldpartreturn_detail")
+public class AsOldpartreturnDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+	@ApiModelProperty("商品spusid")
+    private String goodsSpuSid; // 商品spusid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skusid")
+    private String goodsSkuSid; // 商品skusid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
+	@ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+	@ApiModelProperty("厂商sid")
+    private String manufacturerSid; // 厂商sid
+	@ApiModelProperty("厂商名称")
+    private String manufacturerName; // 厂商名称
+	@ApiModelProperty("规格")
+    private String goodsSkuOwnSpec; // 规格
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+	@ApiModelProperty("库区名称")
+    private String warehouseAreaName; // 库区名称
+	@ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+	@ApiModelProperty("库位名称")
+    private String warehouseRackName; // 库位名称
+	@ApiModelProperty("库存数量")
+    private BigDecimal count; // 库存数量
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java → yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDetailsVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.api.asoldparthandle;
+package com.yxt.anrui.as.api.asoldpartreturndetail;
 
 
 import com.yxt.common.core.vo.Vo;
@@ -35,36 +35,42 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * Project: yxt-as(旧件处理申请) <br/>
+ * Project: yxt-as(旧件) <br/>
- * File: AsOldparthandleVo.java <br/>
+ * File: AsOldpartreturnDetailVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailVo <br/>
- * Description: 处理旧件列表 视图数据对象. <br/>
+ * Description: 返厂旧件列表明细 视图数据对象. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-23 17:56:59 <br/>
+ * Makedate: 2024-08-23 09:18:46 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "处理旧件列表 视图数据对象", description = "处理旧件列表 视图数据对象")
+@ApiModel(value = "返厂旧件列表明细 视图数据详情", description = "返厂旧件列表明细 视图数据详情")
-public class AsOldparthandleVo implements Vo {
+public class AsOldpartreturnDetailDetailsVo implements Vo {
 
     private String sid; // sid
 
 	@ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
-    private String vinNo; // 车架号
 	@ApiModelProperty("商品ID")
-    private String goodsSkuId; // 商品ID
+    private String goodsID; // 商品ID
-	@ApiModelProperty("商品名称")
+	@ApiModelProperty("商品spusid")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuSid; // 商品spusid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skusid")
+    private String goodsSkuSid; // 商品skusid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
 	@ApiModelProperty("图号")
     private String goodsSkuCode; // 图号
-    @ApiModelProperty("供应商")
+	@ApiModelProperty("厂商sid")
-    private String supplierName;
+    private String manufacturerSid; // 厂商sid
+	@ApiModelProperty("厂商名称")
+    private String manufacturerName; // 厂商名称
 	@ApiModelProperty("规格")
     private String goodsSkuOwnSpec; // 规格
 	@ApiModelProperty("单位")
@@ -73,11 +79,15 @@ public class AsOldparthandleVo implements Vo {
     private String warehouseSid; // 仓库sid
 	@ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
+	@ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+	@ApiModelProperty("库区名称")
+    private String warehouseAreaName; // 库区名称
 	@ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位编码")
+	@ApiModelProperty("库位名称")
-    private String warehouseRackCode; // 库位编码
+    private String warehouseRackName; // 库位名称
-	@ApiModelProperty("数量")
+	@ApiModelProperty("库存数量")
-    private BigDecimal count; // 数量
+    private BigDecimal count; // 库存数量
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java → yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturndetail/AsOldpartreturnDetailDto.java

@@ -23,10 +23,10 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.api.asoldparthandle;
+package com.yxt.anrui.as.api.asoldpartreturndetail;
 
 
-import com.yxt.common.core.query.Query;
+import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,34 +35,42 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * Project: yxt-as(旧件处理申请) <br/>
+ * Project: yxt-as(旧件) <br/>
- * File: AsOldparthandleQuery.java <br/>
+ * File: AsOldpartreturnDetailDto.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery <br/>
+ * Class: com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto <br/>
- * Description: 处理旧件列表 查询条件. <br/>
+ * Description: 返厂旧件列表明细 数据传输对象. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-23 17:56:59 <br/>
+ * Makedate: 2024-08-23 09:18:45 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "处理旧件列表 查询条件", description = "处理旧件列表 查询条件")
+@ApiModel(value = "返厂旧件列表明细 数据传输对象", description = "返厂旧件列表明细 数据传输对象")
-public class AsOldparthandleQuery implements Query {
+public class AsOldpartreturnDetailDto implements Dto {
+
+    private String sid; // sid
 
 	@ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
-    private String vinNo; // 车架号
 	@ApiModelProperty("商品ID")
-    private String goodsSkuId; // 商品ID
+    private String goodsID; // 商品ID
-	@ApiModelProperty("商品名称")
+	@ApiModelProperty("商品spusid")
-    private String goodsSkuName; // 商品名称
+    private String goodsSpuSid; // 商品spusid
+	@ApiModelProperty("商品spu名称")
+    private String goodsSpuName; // 商品spu名称
+	@ApiModelProperty("商品skusid")
+    private String goodsSkuSid; // 商品skusid
+	@ApiModelProperty("商品sku名称")
+    private String goodsSkuTitle; // 商品sku名称
 	@ApiModelProperty("图号")
     private String goodsSkuCode; // 图号
-    @ApiModelProperty("供应商")
+	@ApiModelProperty("厂商sid")
-    private String supplierName;
+    private String manufacturerSid; // 厂商sid
+	@ApiModelProperty("厂商名称")
+    private String manufacturerName; // 厂商名称
 	@ApiModelProperty("规格")
     private String goodsSkuOwnSpec; // 规格
 	@ApiModelProperty("单位")
@@ -71,11 +79,15 @@ public class AsOldparthandleQuery implements Query {
     private String warehouseSid; // 仓库sid
 	@ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
+	@ApiModelProperty("库区sid")
+    private String warehouseAreaSid; // 库区sid
+	@ApiModelProperty("库区名称")
+    private String warehouseAreaName; // 库区名称
 	@ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位编码")
+	@ApiModelProperty("库位名称")
-    private String warehouseRackCode; // 库位编码
+    private String warehouseRackName; // 库位名称
-	@ApiModelProperty("数量")
+	@ApiModelProperty("库存数量")
-    private BigDecimal count; // 数量
+    private BigDecimal count; // 库存数量
 
 }

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

@@ -2,6 +2,7 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,4 +24,6 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper<AsBusre
     List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSid(@Param("sid") String sid);
 
     List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSidForBack(@Param("sid") String sid);
+
+    AsOldpartreturnDetailsVo selByGdSidAndOldCode(@Param("repairBillSid") String repairBillSid,@Param("goodsSkuCode") String goodsSkuCode);
 }

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

@@ -43,4 +43,24 @@
 --         GROUP BY
 --             d.goodsID,d.sitemSid
     </select>
+
+    <select id="selByGdSidAndOldCode" resultType="com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo">
+        SELECT
+                ad.goodsSpuSid,
+                ad.goodsSpuName,
+                ad.goodsSkuSid,
+                ad.goodsSkuTitle,
+                ad.oldGoodsSkuCode AS goodsSkuCode,
+                ad.manufacturerSid,
+                ad.manufacturerName,
+                ad.goodsSkuOwnSpec,
+                ad.unit
+        FROM
+                as_busrepair_inventorybill_detail ad
+                        LEFT JOIN as_busrepair_inventorybill ai
+                        ON ad.`billSid` = ai.`sid`
+        WHERE ai.sourceBillSid = #{repairBillSid}
+          AND ad.oldGoodsSkuCode = #{goodsSkuCode}
+                LIMIT 1
+    </select>
 </mapper>

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto;
+import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
@@ -68,4 +69,8 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
 //        }
         return list;
     }
+
+    public AsOldpartreturnDetailsVo selByGdSidAndOldCode(String repairBillSid, String goodsSkuCode) {
+        return baseMapper.selByGdSidAndOldCode(repairBillSid,goodsSkuCode);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.java

@@ -35,36 +35,12 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle;
-import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
 
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleMapper <br/>
- * Description: 处理旧件列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-23 17:56:59 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AsOldparthandleMapper extends BaseMapper<AsOldparthandle> {
 
-	//@Update("update as_oldparthandle set name=#{msg} where id=#{id}")
-	//IPage<AsOldparthandleVo> voPage(IPage<AsOldparthandle> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandle> qw);
-	
-	IPage<AsOldparthandleVo> selectPageVo(IPage<AsOldparthandle> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandle> qw);
-	
-	List<AsOldparthandleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandle> qw);
-	
-	@Select("select * from as_oldparthandle")
-	List<AsOldparthandleVo> selectListVo();
-
 	@Delete("delete from as_oldparthandle where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleMapper.xml

@@ -3,11 +3,4 @@
 <mapper namespace="com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo">
-		SELECT * FROM as_oldparthandle <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo">
-		SELECT * FROM as_oldparthandle <where> ${ew.sqlSegment} </where>
-	</select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleRest.java

@@ -33,8 +33,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery;
-import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 
@@ -56,38 +54,4 @@ import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 @RequestMapping("v1/asoldparthandle")
 public class AsOldparthandleRest{
 
-	@Autowired
-	private AsOldparthandleService asOldparthandleService;
-
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldparthandleVo>> listPage(@RequestBody PagerQuery<AsOldparthandleQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsOldparthandleVo> pv = asOldparthandleService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody AsOldparthandleDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asOldparthandleService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@ApiOperation("根据sid批量删除")
-    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		asOldparthandleService.delBySids(sids);
-		return rb.success();
-	}
-
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldparthandleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		AsOldparthandleDetailsVo vo = asOldparthandleService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandle/AsOldparthandleService.java

@@ -34,8 +34,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle;
-import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleQuery;
-import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 
@@ -58,26 +56,7 @@ import java.util.List;
  */
 @Service
 public class AsOldparthandleService extends MybatisBaseService<AsOldparthandleMapper, AsOldparthandle> {
-    private QueryWrapper<AsOldparthandle> createQueryWrapper(AsOldparthandleQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<AsOldparthandle> qw = new QueryWrapper<>();
-        return qw;
-    }
 
-    public PagerVo<AsOldparthandleVo> listPageVo(PagerQuery<AsOldparthandleQuery> pq) {
-        AsOldparthandleQuery query = pq.getParams();
-        QueryWrapper<AsOldparthandle> qw = createQueryWrapper(query);
-        IPage<AsOldparthandle> page = PagerUtil.queryToPage(pq);
-        IPage<AsOldparthandleVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<AsOldparthandleVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void saveOrUpdateDto(AsOldparthandleDto dto) {
-        this.insertByDto(dto);
-        return;
-    }
 
     public void insertByDto(AsOldparthandleDto dto) {
         AsOldparthandle entity = new AsOldparthandle();
@@ -85,23 +64,6 @@ public class AsOldparthandleService extends MybatisBaseService<AsOldparthandleMa
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(AsOldparthandleDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        AsOldparthandle entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
-    public AsOldparthandleDetailsVo fetchDetailsVoBySid(String sid) {
-        AsOldparthandle entity = fetchBySid(sid);
-        AsOldparthandleDetailsVo vo = new AsOldparthandleDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
-
     public void delByMainSid(String dtoSid) {
         baseMapper.delByMainSid(dtoSid);
     }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml

@@ -5,9 +5,12 @@
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo">
 		SELECT
-		aoa.*
+		aoa.*,
+		SUM(ao.profit) AS profitTotal
 		FROM
 		as_oldparthandle_apply aoa
+		LEFT JOIN as_oldparthandle ao
+		ON aoa.sid = ao.mainSid
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java

@@ -155,8 +155,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 		if (StringUtils.isNotBlank(query.getUseOrgName())){
 			qw.like("aoa.useOrgName",query.getUseOrgName());
 		}
-		if (StringUtils.isNotBlank(query.getDeptName())){
+		if (StringUtils.isNotBlank(query.getCreateDeptName())){
-			qw.like("aoa.deptName",query.getDeptName());
+			qw.like("aoa.deptName",query.getCreateDeptName());
 		}
 		if (StringUtils.isNotBlank(query.getCreateByName())){
 			qw.like("aoa.createByName",query.getCreateByName());
@@ -180,6 +180,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
+		qw.groupBy("aoa.sid");
+		qw.orderByDesc("aoa.createTime");
 		IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null);
@@ -210,7 +212,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 			String sid = this.insertByDto(dto);
 			for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
 				asOldparthandleDto.setMainSid(sid);
-				asOldparthandleService.saveOrUpdateDto(asOldparthandleDto);
+				asOldparthandleService.insertByDto(asOldparthandleDto);
 			}
 			return sid;
         } 
@@ -218,7 +220,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
 		asOldparthandleService.delByMainSid(dtoSid);
 		for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
 			asOldparthandleDto.setMainSid(dtoSid);
-			asOldparthandleService.saveOrUpdateDto(asOldparthandleDto);
+			asOldparthandleService.insertByDto(asOldparthandleDto);
 		}
 		return dtoSid;
 	}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.java

@@ -35,7 +35,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturn;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo;
 
 import java.util.List;
 
@@ -55,16 +54,6 @@ import java.util.List;
 @Mapper
 public interface AsOldpartreturnMapper extends BaseMapper<AsOldpartreturn> {
 
-	//@Update("update as_oldpartreturn set name=#{msg} where id=#{id}")
-	//IPage<AsOldpartreturnVo> voPage(IPage<AsOldpartreturn> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldpartreturn> qw);
-	
-	IPage<AsOldpartreturnVo> selectPageVo(IPage<AsOldpartreturn> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturn> qw);
-	
-	List<AsOldpartreturnVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldpartreturn> qw);
-	
-	@Select("select * from as_oldpartreturn")
-	List<AsOldpartreturnVo> selectListVo();
-
 	@Delete("delete from as_oldpartreturn where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnMapper.xml

@@ -3,11 +3,4 @@
 <mapper namespace="com.yxt.anrui.as.biz.asoldpartreturn.AsOldpartreturnMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo">
-		SELECT * FROM as_oldpartreturn <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo">
-		SELECT * FROM as_oldpartreturn <where> ${ew.sqlSegment} </where>
-	</select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnRest.java

@@ -33,8 +33,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
 
@@ -56,38 +54,4 @@ import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
 @RequestMapping("v1/asoldpartreturn")
 public class AsOldpartreturnRest {
 
-	@Autowired
-	private AsOldpartreturnService asOldpartreturnService;
-
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsOldpartreturnVo> pv = asOldpartreturnService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody AsOldpartreturnDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asOldpartreturnService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@ApiOperation("根据sid批量删除")
-    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		asOldpartreturnService.delBySids(sids);
-		return rb.success();
-	}
-
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldpartreturnDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		AsOldpartreturnDetailsVo vo = asOldpartreturnService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java

@@ -34,8 +34,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturn;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
 
@@ -59,41 +57,11 @@ import java.util.List;
 @Service
 public class AsOldpartreturnService extends MybatisBaseService<AsOldpartreturnMapper, AsOldpartreturn> {
 
-    public PagerVo<AsOldpartreturnVo> listPageVo(PagerQuery<AsOldpartreturnQuery> pq) {
+    public String insertByDto(AsOldpartreturnDto dto) {
-        AsOldpartreturnQuery query = pq.getParams();
-        QueryWrapper<AsOldpartreturn> qw = new QueryWrapper<>();
-        IPage<AsOldpartreturn> page = PagerUtil.queryToPage(pq);
-        IPage<AsOldpartreturnVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<AsOldpartreturnVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void saveOrUpdateDto(AsOldpartreturnDto dto) {
-        this.insertByDto(dto);
-        return;
-    }
-
-    public void insertByDto(AsOldpartreturnDto dto) {
         AsOldpartreturn entity = new AsOldpartreturn();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
-    }
+        return entity.getSid();
-
-    public void updateByDto(AsOldpartreturnDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        AsOldpartreturn entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
-    public AsOldpartreturnDetailsVo fetchDetailsVoBySid(String sid) {
-        AsOldpartreturn entity = fetchBySid(sid);
-        AsOldpartreturnDetailsVo vo = new AsOldpartreturnDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
     }
 
     public void delByMainSid(String dtoSid) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java

@@ -34,12 +34,18 @@ import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply;
 import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.AsArrearsoutApplyNodeVo;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.SubmitAsArrearsoutApplyDto;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnExcelInfo;
 import com.yxt.anrui.as.api.asoldpartreturn.ReturnExcelInfo;
 import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto;
+import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
+import com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillService;
+import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
 import com.yxt.anrui.as.biz.asoldpartreturn.AsOldpartreturnService;
+import com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailService;
 import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.*;
 import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
@@ -55,6 +61,8 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign;
+import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryReturnFactSelectList;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
@@ -78,6 +86,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -126,7 +135,15 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 	@Autowired
 	private AsOldpartreturnService asOldpartreturnService;
 	@Autowired
+	private AsOldpartreturnDetailService asOldpartreturnDetailService;
+	@Autowired
 	private HttpServletResponse response;
+	@Autowired
+	private AsBusclaimBillService asBusclaimBillService;
+	@Autowired
+	private AsBusrepairInventorybillDetailService asBusrepairInventorybillDetailService;
+	@Resource
+	private WmsInventoryFeign wmsInventoryFeign;
 
 	public PagerVo<AsOldpartreturnApplyVo> listPageVo(PagerQuery<AsOldpartreturnApplyQuery> pq) {
 		AsOldpartreturnApplyQuery query = pq.getParams();
@@ -238,7 +255,14 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 			String sid = this.insertByDto(dto);
 			for (AsOldpartreturnDto asOldpartreturnDto : asOldpartreturnList) {
 				asOldpartreturnDto.setMainSid(sid);
-				asOldpartreturnService.saveOrUpdateDto(asOldpartreturnDto);
+				String detailSid = asOldpartreturnService.insertByDto(asOldpartreturnDto);
+				List<WmsInventoryReturnFactSelectList> data = wmsInventoryFeign.selBillNoAndCode(asOldpartreturnDto.getSourceBillNo(), asOldpartreturnDto.getGoodsSkuCode(), deptSid).getData();
+				for (WmsInventoryReturnFactSelectList datum : data) {
+					AsOldpartreturnDetailDto asOldpartreturnDetailDto = new AsOldpartreturnDetailDto();
+					BeanUtil.copyProperties(datum,asOldpartreturnDetailDto);
+					asOldpartreturnDetailDto.setMainSid(detailSid);
+					asOldpartreturnDetailService.insertByDto(asOldpartreturnDetailDto);
+				}
 			}
 			return sid;
         } 
@@ -246,7 +270,7 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		asOldpartreturnService.delByMainSid(dtoSid);
 		for (AsOldpartreturnDto asOldpartreturnDto : asOldpartreturnList) {
 			asOldpartreturnDto.setMainSid(dtoSid);
-			asOldpartreturnService.saveOrUpdateDto(asOldpartreturnDto);
+			asOldpartreturnService.insertByDto(asOldpartreturnDto);
 		}
 		return dtoSid;
 	}
@@ -701,12 +725,14 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		ReturnExcelInfo importReturn = getSheetVal(sheet, resultCell);
 		resultList = importReturn.getInfos();
 		for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) {
-			AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = new AsOldpartreturnDetailsVo();
+			AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
+			AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = asBusrepairInventorybillDetailService.selByGdSidAndOldCode(asBusclaimBill.getRepairBillSid(),asOldpartreturnExcelInfo.getGoodsSkuCode());
 			asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo());
-			asOldpartreturnDetailsVo.setGoodsSkuName(asOldpartreturnExcelInfo.getGoodsSkuName());
+			asOldpartreturnDetailsVo.setSourceBillNo(asBusclaimBill.getRepairBillNo());
-			asOldpartreturnDetailsVo.setGoodsSkuCode(asOldpartreturnExcelInfo.getGoodsSkuCode());
+			asOldpartreturnDetailsVo.setClaimBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
-			asOldpartreturnDetailsVo.setManufacturerName(asOldpartreturnExcelInfo.getManufacturerName());
+			asOldpartreturnDetailsVo.setIsCf("否");
 			asOldpartreturnDetailsVo.setNeedReturnCount(asOldpartreturnExcelInfo.getNeedReturnCount());
+			asOldpartreturnDetailsVo.setActualReturnCount(asOldpartreturnDetailsVo.getNeedReturnCount());
 			resultList2.add(asOldpartreturnDetailsVo);
 		}
 		if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
@@ -742,19 +768,22 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 						if (i == resultCell[j]) {
 							switch (i) {
 								case 0:
-									importVo.setVinNo(temp);
+									importVo.setGoodsSkuName(temp);
 									break;
 								case 1:
-									importVo.setGoodsSkuName(temp);
+									importVo.setGoodsSkuCode(temp);
 									break;
 								case 2:
-									importVo.setGoodsSkuCode(temp);
+									importVo.setManufacturerName(temp);
 									break;
 								case 3:
-									importVo.setManufacturerName(temp);
+									importVo.setNeedReturnCount(new BigDecimal(temp));
 									break;
 								case 4:
-									importVo.setNeedReturnCount(new BigDecimal(temp));
+									importVo.setVinNo(temp);
+									break;
+								case 5:
+									importVo.setClaimBillNo(temp);
 									break;
 								default:
 									break;
@@ -768,19 +797,22 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 						String word = new String();
 						switch (i) {
 							case 0:
-								word = "车架号";
+								word = "商品名称";
 								break;
 							case 1:
-								word = "商品名称";
+								word = "图号";
 								break;
 							case 2:
-								word = "图号";
+								word = "厂家";
 								break;
 							case 3:
-								word = "厂家";
+								word = "需返厂数量";
 								break;
 							case 4:
-								word = "需返厂数量";
+								word = "车架号";
+								break;
+							case 5:
+								word = "索赔单号";
 								break;
 							default:
 								break;
@@ -809,6 +841,10 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 					checkWord.add("厂家不能为空");
 					break;
 				}
+				if (StringUtils.isBlank(excelInfo.getClaimBillNo())) {
+					checkWord.add("索赔单号不能为空");
+					break;
+				}
 				if (StringUtils.isNotBlank(excelInfo.getNeedReturnCount().toString())) {
 					String count = excelInfo.getNeedReturnCount().toString();
 					Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnQuery.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailMapper.java

@@ -23,45 +23,33 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.api.asoldpartreturn;
+package com.yxt.anrui.as.biz.asoldpartreturndetail;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetail;
 
-import com.yxt.common.core.query.Query;
+import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
 
 /**
- * Project: anrui-as(旧件返厂) <br/>
+ * Project: yxt-as(旧件) <br/>
- * File: AsOldpartreturnQuery.java <br/>
+ * File: AsOldpartreturnDetailMapper.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnQuery <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailMapper <br/>
- * Description: 返厂旧件列表 查询条件. <br/>
+ * Description: 返厂旧件列表明细. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
+ * Makedate: 2024-08-23 09:18:46 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
-@Data
+@Mapper
-@ApiModel(value = "返厂旧件列表 查询条件", description = "返厂旧件列表 查询条件")
+public interface AsOldpartreturnDetailMapper extends BaseMapper<AsOldpartreturnDetail> {
-public class AsOldpartreturnQuery implements Query {
-
-	@ApiModelProperty("商品名称")
-    private String goodsSkuName; // 商品名称
-	@ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
-	@ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
-	@ApiModelProperty("单位")
-    private String unit; // 单位
-	@ApiModelProperty("需返厂数量")
-    private BigDecimal needReturnCount; // 需返厂数量
-	@ApiModelProperty("实际返厂数量")
-    private BigDecimal actualReturnCount; // 实际返厂数量
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailRest.java

@@ -23,42 +23,35 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.feign.wms.wmsInventory;
+package com.yxt.anrui.as.biz.asoldpartreturndetail;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import org.springframework.stereotype.Component;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto;
 
 /**
- * Project: anrui-fin(安瑞财务) <br/>
+ * Project: yxt-as(旧件) <br/>
- * File: FinManufacturerBankFeignFallback.java <br/>
+ * File: AsOldpartreturnDetailFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailRest <br/>
- * Description: 公司开户账号表. <br/>
+ * Description: 返厂旧件列表明细. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-03 15:00:11 <br/>
+ * Makedate: 2024-08-23 09:18:46 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
-@Component
+@Api(tags = "返厂旧件列表明细")
-public class WmsInventoryFeignFallback implements WmsInventoryFeign {
+@RestController
-
+@RequestMapping("v1/asoldpartreturndetail")
-
+public class AsOldpartreturnDetailRest {
-	@Override
-	public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(PagerQuery<WmsInventoryPackageQuery> pq) {
-		return null;
-	}
-
-	@Override
-	public ResultBean updateInventoryCount(WmsUpdateCountQuery query) {
-		return null;
-	}
 
-	@Override
-	public ResultBean<WmsInventory> fetchEntityBySid(String sid) {
-		return null;
-	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnVo.java → yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturndetail/AsOldpartreturnDetailService.java

@@ -23,47 +23,41 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.as.api.asoldpartreturn;
+package com.yxt.anrui.as.biz.asoldpartreturndetail;
-
+
-
+import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.core.vo.Vo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiModel;
+import org.apache.commons.lang3.StringUtils;
-import io.swagger.annotations.ApiModelProperty;
+import com.yxt.common.base.service.MybatisBaseService;
-import lombok.Data;
+import com.yxt.common.base.utils.PagerUtil;
-
+import com.yxt.common.core.query.PagerQuery;
-import java.math.BigDecimal;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetail;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo;
+import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDto;
+
+import org.springframework.stereotype.Service;
 
 /**
- * Project: anrui-as(旧件返厂) <br/>
+ * Project: yxt-as(旧件) <br/>
- * File: AsOldpartreturnVo.java <br/>
+ * File: AsOldpartreturnDetailService.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo <br/>
+ * Class: com.yxt.anrui.as.biz.asoldpartreturndetail.AsOldpartreturnDetailService <br/>
- * Description: 返厂旧件列表 视图数据对象. <br/>
+ * Description: 返厂旧件列表明细 业务逻辑. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
+ * Makedate: 2024-08-23 09:18:46 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
-@Data
+@Service
-@ApiModel(value = "返厂旧件列表 视图数据对象", description = "返厂旧件列表 视图数据对象")
+public class AsOldpartreturnDetailService extends MybatisBaseService<AsOldpartreturnDetailMapper, AsOldpartreturnDetail> {
-public class AsOldpartreturnVo implements Vo {
+
-
+	public void insertByDto(AsOldpartreturnDetailDto dto){
-    private String sid; // sid
+		AsOldpartreturnDetail entity = new AsOldpartreturnDetail();
-
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
-	@ApiModelProperty("商品名称")
+		baseMapper.insert(entity);
-    private String goodsSkuName; // 商品名称
+	}
-	@ApiModelProperty("图号")
-    private String goodsSkuCode; // 图号
-	@ApiModelProperty("规格")
-    private String goodsSkuOwnSpec; // 规格
-	@ApiModelProperty("单位")
-    private String unit; // 单位
-	@ApiModelProperty("需返厂数量")
-    private BigDecimal needReturnCount; // 需返厂数量
-	@ApiModelProperty("实际返厂数量")
-    private BigDecimal actualReturnCount; // 实际返厂数量
-
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @description: 商品基础信息
  * @author: fzz
@@ -17,8 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(
         contextId = "yxt-wms-WmsInventory",
         name = "yxt-wms",
-        path = "apiadmin/inventory/wmsinventory",
+        path = "apiadmin/inventory/wmsinventory"
-        fallback = WmsInventoryFeignFallback.class
 )
 public interface WmsInventoryFeign {
 
@@ -33,4 +34,8 @@ public interface WmsInventoryFeign {
     @ApiOperation("根据Sid获取库存实体")
     @PostMapping("/fetchEntityBySid")
     ResultBean<WmsInventory> fetchEntityBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据维修单号和旧件图号查询旧件库存")
+    @PostMapping("/selBillNoAndCode")
+    ResultBean<List<WmsInventoryReturnFactSelectList>> selBillNoAndCode(@RequestParam("sourceBillNo") String sourceBillNo,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("deptSid") String deptSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryReturnFactSelectList.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.as.feign.wms.wmsInventory;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class WmsInventoryReturnFactSelectList {
+
+    //商品ID
+    private String goodsID;
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
+    private String goodsSpuName;
+    //商品Skusid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
+    //图号
+    private String goodsSkuCode;
+    //规格
+    private String goodsSkuOwnSpec;
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
+    //单位
+    private String unit;
+    //仓库sid
+    private String warehouseSid;
+    //仓库名称
+    private String warehouseName;
+    //库区sid
+    private String warehouseAreaSid;
+    //库区名称
+    private String warehouseAreaName;
+    //库位sid
+    private String warehouseRackSid;
+    //库位名称
+    private String warehouseRackName;
+    //库存数量
+    private String count;
+    //车架号
+    private String vinNo;
+    //维修单号
+    private String sourceBillNo;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -202,6 +202,18 @@ public class WmsInventoryRest {
         return wmsInventoryService.handleGoodsListPage(pq);
     }
 
+    @ApiOperation("旧件返厂商品分页列表")
+    @PostMapping("/returnFactGoodsListPage")
+    public ResultBean<PagerVo<WmsInventoryReturnFactSelectList>> returnFactGoodsListPage(@RequestBody PagerQuery<WmsInventoryReturnFactSelectQuery> pq) {
+        return wmsInventoryService.returnFactGoodsListPage(pq);
+    }
+
+    @ApiOperation("根据维修单号和旧件图号查询旧件库存")
+    @PostMapping("/selBillNoAndCode")
+    ResultBean<List<WmsInventoryReturnFactSelectList>> selBillNoAndCode(@RequestParam("sourceBillNo") String sourceBillNo,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("deptSid") String deptSid){
+        return wmsInventoryService.selBillNoAndCode(sourceBillNo,goodsSkuCode,deptSid);
+    };
+
     @ApiOperation("根据Sid获取库存实体")
     @PostMapping("/fetchEntityBySid")
     ResultBean<WmsInventory> fetchEntityBySid(@RequestParam("sid") String sid) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java

@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.inventory.wmsinventory;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,16 +13,28 @@ public class WmsInventoryHandleSelectList {
 
     //商品ID
     private String goodsID;
-    //商品名称
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
     private String goodsSpuName;
+    //商品Skusid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
     //图号
     private String goodsSkuCode;
-    //供应商
-    private String supplierName;
     //规格
     private String goodsSkuOwnSpec;
-    //商品单位
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
+    //单位
     private String unit;
+    //供应商sid
+    private String supplierSid;
+    //供应商名称
+    private String supplierName;
     //仓库sid
     private String warehouseSid;
     //仓库名称
@@ -32,4 +45,10 @@ public class WmsInventoryHandleSelectList {
     private String warehouseRackCode;
     //库存数量
     private String count;
+    //单价
+    private String price;
+    //维修单号
+    private String sourceBillNo;
+    //车架号
+    private String vinNo;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectQuery.java

@@ -12,7 +12,7 @@ import lombok.Data;
 public class WmsInventoryHandleSelectQuery implements Query {
 
     //组织sid
-    private String orgSid;
+    private String orgPath;
     //商品名称
     private String goodsName;
     //图号
@@ -23,4 +23,6 @@ public class WmsInventoryHandleSelectQuery implements Query {
     private String warehouseRackCode;
     //供应商
     private String supplierName;
+    //厂商
+    private String manufacturerName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@@ -71,6 +71,10 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
 
     IPage<WmsInventoryBillUseOrgSidVo> selInvenGoodsByUseOrgSid(IPage<WmsInventory> page,@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
 
+    IPage<WmsInventoryReturnFactSelectList> returnFactGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
+
+    List<WmsInventoryReturnFactSelectList> selBillNoAndCode(@Param("sourceBillNo") String sourceBillNo,@Param("goodsSkuCode") String goodsSkuCode,@Param("deptSid") String deptSid);
+
     IPage<FittingsInventoryVo> fittingsInventory(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
 
     List<StorageListVo> appStorage(@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -273,19 +273,35 @@
     <select id="handleGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryHandleSelectList">
         SELECT
         wi.goodsID,
+        wi.goodsSpuSid,
         wi.goodsSpuName,
+        wi.goodsSkuSid,
+        wi.goodsSkuTitle,
         wi.goodsSkuCode,
         wi.goodsSkuOwnSpec,
+        wi.manufacturerSid,
+        wi.manufacturerName,
+        wi.billObjSid AS supplierSid,
+        wi.billObjName AS supplierName,
         wi.unit,
         wi.warehouseSid,
         wi.warehouseName,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
         wi.count,
-        wb.supplierName
+        wi.cost AS price,
-        FROM wms_inventory wi
+        ab.billNo AS sourceBillNo,
-        LEFT JOIN wms_inventory_batch wb
+        av.vinNo
-        ON wi.sid = wb.inventorySid
+        FROM
+        wms_inventory wi
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill_detail ad
+        ON wi.sid = ad.oldInventorySid
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai
+        ON ad.billSid = ai.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill ab
+        ON ai.sourceBillSid = ab.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech av
+        ON ab.sid = av.billSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -487,4 +503,83 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="returnFactGoodsListPage"
+            resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryReturnFactSelectList">
+        SELECT
+        wi.goodsID,
+        wi.goodsSpuSid,
+        wi.goodsSpuName,
+        wi.goodsSkuSid,
+        wi.goodsSkuTitle,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.manufacturerSid,
+        wi.manufacturerName,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wa.sid AS warehouseAreaSid,
+        wa.areaName AS warehouseAreaName,
+        wi.warehouseRackSid,
+        wr.rackName AS warehouseRackName,
+        wi.count,
+        ab.billNo AS sourceBillNo,
+        av.vinNo
+        FROM
+        wms_inventory wi
+        LEFT JOIN wms_warehouse_rack wr
+        ON wi.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area wa
+        ON wr.locationSid = wa.sid
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill_detail ad
+        ON wi.sid = ad.oldInventorySid
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai
+        ON ad.billSid = ai.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill ab
+        ON ai.sourceBillSid = ab.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech av
+        ON ab.sid = av.billSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selBillNoAndCode" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryReturnFactSelectList">
+        SELECT
+                wi.goodsID,
+                wi.goodsSpuSid,
+                wi.goodsSpuName,
+                wi.goodsSkuSid,
+                wi.goodsSkuTitle,
+                wi.goodsSkuCode,
+                wi.goodsSkuOwnSpec,
+                wi.manufacturerSid,
+                wi.manufacturerName,
+                wi.unit,
+                wi.warehouseSid,
+                wi.warehouseName,
+                wa.sid AS warehouseAreaSid,
+                wa.areaName AS warehouseAreaName,
+                wi.warehouseRackSid,
+                wr.rackName AS warehouseRackName,
+                wi.count
+        FROM
+                wms_inventory wi
+                        LEFT JOIN wms_warehouse_rack wr
+                        ON wi.warehouseRackSid = wr.sid
+                        LEFT JOIN wms_warehouse_area wa
+                        ON wr.locationSid = wa.sid
+                        LEFT JOIN yxt_4sas.as_busrepair_inventorybill_detail ad
+                        ON wi.sid = ad.oldInventorySid
+                        LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai
+                        ON ad.billSid = ai.sid
+                        LEFT JOIN yxt_4sas.as_busrepair_bill ab
+                        ON ai.sourceBillSid = ab.sid
+                        LEFT JOIN yxt_4sas.as_busrepair_bill_vech av
+                        ON ab.sid = av.billSid
+        WHERE ab.billNo = #{sourceBillNo}
+        AND wi.goodsSkuCode = #{goodsSkuCode}
+        AND wi.useOrgSid = #{deptSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectList.java

@@ -0,0 +1,51 @@
+package com.yxt.wms.biz.inventory.wmsinventory;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class WmsInventoryReturnFactSelectList {
+
+    //商品ID
+    private String goodsID;
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
+    private String goodsSpuName;
+    //商品Skusid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
+    //图号
+    private String goodsSkuCode;
+    //规格
+    private String goodsSkuOwnSpec;
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
+    //单位
+    private String unit;
+    //仓库sid
+    private String warehouseSid;
+    //仓库名称
+    private String warehouseName;
+    //库区sid
+    private String warehouseAreaSid;
+    //库区名称
+    private String warehouseAreaName;
+    //库位sid
+    private String warehouseRackSid;
+    //库位名称
+    private String warehouseRackName;
+    //库存数量
+    private String count;
+    //车架号
+    private String vinNo;
+    //维修单号
+    private String sourceBillNo;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryReturnFactSelectQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.wms.biz.inventory.wmsinventory;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class WmsInventoryReturnFactSelectQuery implements Query {
+
+    //组织sid
+    private String orgPath;
+    //图号
+    private String goodsSkuCode;
+    //车架号
+    private String vinNo;
+    //维修单号
+    private String sourceBillNo;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -32,6 +32,7 @@ import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -494,6 +495,17 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         ResultBean rb = ResultBean.fireFail();
         WmsInventoryHandleSelectQuery query = pq.getParams();
         QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
+        String useOrgSid;
+        List<String> split = Arrays.asList(query.getOrgPath().split("/"));
+        if (split.size() > 1) {
+            //获取本级sid获取本级部门信息
+            SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+            useOrgSid = sysOrganization1.getSid();
+        } else {
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+            useOrgSid = sysOrganization.getSid();
+        }
+        qw.eq("wi.useOrgSid", useOrgSid);
         if (StringUtils.isNotBlank(query.getGoodsName())) {
             qw.like("wi.goodsSpuName", query.getGoodsName());
         }
@@ -507,8 +519,13 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             qw.like("wi.warehouseRackCode", query.getWarehouseRackCode());
         }
         if (StringUtils.isNotBlank(query.getSupplierName())) {
-            qw.like("wb.supplierName", query.getSupplierName());
+            qw.like("wi.billObjName", query.getSupplierName());
         }
+        if (StringUtils.isNotBlank(query.getManufacturerName())) {
+            qw.like("wi.manufacturerName", query.getManufacturerName());
+        }
+        qw.like("wi.goodsID", "-O");
+        qw.gt("wi.count", 0);
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryHandleSelectList> pagging = baseMapper.handleGoodsListPage(page, qw);
         PagerVo<WmsInventoryHandleSelectList> p = PagerUtil.pageToVo(pagging, null);
@@ -904,4 +921,42 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         }
         return pagerVo;
     }
+
+    public ResultBean<PagerVo<WmsInventoryReturnFactSelectList>> returnFactGoodsListPage(PagerQuery<WmsInventoryReturnFactSelectQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsInventoryReturnFactSelectQuery query = pq.getParams();
+        QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
+        String useOrgSid;
+        List<String> split = Arrays.asList(query.getOrgPath().split("/"));
+        if (split.size() > 1) {
+            //获取本级sid获取本级部门信息
+            SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+            useOrgSid = sysOrganization1.getSid();
+        } else {
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+            useOrgSid = sysOrganization.getSid();
+        }
+        qw.eq("wi.useOrgSid", useOrgSid);
+        if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+            qw.eq("ab.billNo", query.getSourceBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.eq("wi.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.eq("av.vinNo", query.getVinNo());
+        }
+        qw.like("wi.goodsID", "-O");
+        qw.gt("wi.count", 0);
+        IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
+        IPage<WmsInventoryReturnFactSelectList> pagging = baseMapper.returnFactGoodsListPage(page, qw);
+        PagerVo<WmsInventoryReturnFactSelectList> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
+    public ResultBean<List<WmsInventoryReturnFactSelectList>> selBillNoAndCode(String sourceBillNo, String goodsSkuCode,String deptSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsInventoryReturnFactSelectList> wmsInventoryReturnFactSelectListList = baseMapper.selBillNoAndCode(sourceBillNo,goodsSkuCode,deptSid);
+        return rb.success().setData(wmsInventoryReturnFactSelectListList);
+    }
 }