From b8b81511b754d709b07b5eb825d8557082a2b7ef Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 24 Apr 2025 14:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/asoldparthandle/AsOldparthandle.java  | 35 +++++++------------
 .../AsOldparthandleDetailsVo.java             | 32 ++++++-----------
 .../asoldparthandle/AsOldparthandleDto.java   | 32 ++++++-----------
 .../AsOldpartreturnApplyService.java          |  4 +++
 .../WmsInventoryHandleSelectList.java         |  4 +++
 .../wmsinventory/WmsInventoryMapper.xml       | 10 ++++--
 6 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
index 9a0fd513c1..85a9dd90ee 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
@@ -33,30 +33,17 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandle.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle <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
- */
 @Data
 @ApiModel(value = "处理旧件列表", description = "处理旧件列表")
 @TableName("as_oldparthandle")
 public class AsOldparthandle extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("主表sid")
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("商品ID")
+    @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
     @ApiModelProperty("商品spuSid")
     private String goodsSpuSid;
@@ -74,21 +61,25 @@ public class AsOldparthandle extends BaseEntity {
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-	@ApiModelProperty("单位")
+    @ApiModelProperty("单位")
     private String unit; // 单位
     @ApiModelProperty("供应商sid")
     private String supplierSid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位编码")
+    @ApiModelProperty("库位编码")
     private String warehouseRackCode; // 库位编码
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private BigDecimal count; // 数量
     @ApiModelProperty("收益金额")
     private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
index 24b64bfd29..dac9f3e33c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandle;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -34,28 +33,15 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <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
- */
 @Data
 @ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
 public class AsOldparthandleDetailsVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("主表sid")
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
@@ -81,15 +67,19 @@ public class AsOldparthandleDetailsVo implements Vo {
     private String supplierSid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位编码")
+    @ApiModelProperty("库位编码")
     private String warehouseRackCode; // 库位编码
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private BigDecimal count; // 数量
     @ApiModelProperty("收益金额")
     private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
index 64910eb183..ed6d0dae02 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandle;
 
-
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
@@ -34,28 +33,15 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleDto.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto <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
- */
 @Data
 @ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象")
 public class AsOldparthandleDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("主表sid")
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
@@ -81,15 +67,19 @@ public class AsOldparthandleDto implements Dto {
     private String supplierSid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位编码")
+    @ApiModelProperty("库位编码")
     private String warehouseRackCode; // 库位编码
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private BigDecimal count; // 数量
     @ApiModelProperty("收益金额")
     private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
index bebc963bbd..82d96faff8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
@@ -688,6 +688,10 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) {
 			AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
 			AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = asBusrepairInventorybillDetailService.selByGdSidAndOldCode(asBusclaimBill.getRepairBillSid(),asOldpartreturnExcelInfo.getGoodsSkuCode());
+			if (asOldpartreturnDetailsVo == null){
+				importReturn.setCheckInfo(asOldpartreturnExcelInfo.getVinNo() + "维修出/退库信息不存在");
+				break;
+			}
 			asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo());
 			asOldpartreturnDetailsVo.setSourceBillNo(asBusclaimBill.getRepairBillNo());
 			asOldpartreturnDetailsVo.setClaimBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
index ef6ab23a80..00a8d119d5 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
@@ -39,6 +39,10 @@ public class WmsInventoryHandleSelectList {
     private String warehouseSid;
     //仓库名称
     private String warehouseName;
+    //库区sid
+    private String warehouseAreaSid;
+    //库区名称
+    private String warehouseAreaName;
     //库位sid
     private String warehouseRackSid;
     //库位编码
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 bc20379878..8d672c6658 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
@@ -328,11 +328,13 @@
         wi.goodsSkuOwnSpec,
         wi.manufacturerSid,
         wi.manufacturerName,
-        wi.billObjSid AS supplierSid,
-        wi.billObjName AS supplierName,
+        wi.supplierSid,
+        wi.supplierName,
         wi.unit,
         wi.warehouseSid,
         wi.warehouseName,
+        wa.sid      AS warehouseAreaSid,
+        wa.areaName AS warehouseAreaName,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
         wi.count,
@@ -341,6 +343,10 @@
         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