Merge remote-tracking branch 'origin/master'

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java

@@ -20,4 +20,7 @@ public class AppOldPartsGoodsSJDto implements Dto {
     private String houseCode;
     @ApiModelProperty("数量")
     private BigDecimal count;
+
+    @ApiModelProperty("图号")
+    private String goodsCode;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java

@@ -26,4 +26,7 @@ public class AppOldPartsScanVo implements Vo {
     private String houseName;
     @ApiModelProperty("仓库地址")
     private String houseAddress;
+
+    @ApiModelProperty("图号")
+    private String goodsCode;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java

@@ -190,6 +190,7 @@ public class AppOldPartsService {
             wmsBusrepairInventorybillDetailOldApp.setGoodsID(appOldPartsGoodsSJDto.getGoodsID());
             wmsBusrepairInventorybillDetailOldApp.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode());
             wmsBusrepairInventorybillDetailOldApp.setCount(appOldPartsGoodsSJDto.getCount());
+            wmsBusrepairInventorybillDetailOldApp.setGoodsCode(appOldPartsGoodsSJDto.getGoodsCode());
             wmsBusrepairInventorybillDetailOldApps.add(wmsBusrepairInventorybillDetailOldApp);
         }
         wmsOldGroundConfirmApp.setOldList(wmsBusrepairInventorybillDetailOldApps);
@@ -222,6 +223,7 @@ public class AppOldPartsService {
             appOldPartsScanVo.setGoodsID(content);
             appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle());
             appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString());
+            appOldPartsScanVo.setGoodsCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
         } else if ("1".equals(type)) {//库位码
             if (!content.contains("#")) {
                 return rb.setMsg("请扫描库位码");

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java

@@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp {
     private String warehouseRackCode;
     @ApiModelProperty("出/退库数量")
     private BigDecimal count;
+
+    private String goodsCode;
 }

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

@@ -33,19 +33,6 @@ 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")
@@ -84,6 +71,10 @@ public class AsOldparthandle extends BaseEntity {
     private String warehouseSid; // 仓库sid
     @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
     @ApiModelProperty("库位编码")

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,19 +33,6 @@ 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 {
@@ -85,6 +71,10 @@ public class AsOldparthandleDetailsVo implements Vo {
     private String warehouseSid; // 仓库sid
     @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
     @ApiModelProperty("库位编码")

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,19 +33,6 @@ 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 {
@@ -85,6 +71,10 @@ public class AsOldparthandleDto implements Dto {
     private String warehouseSid; // 仓库sid
     @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名称")
+    private String warehouseAreaName;
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
     @ApiModelProperty("库位编码")

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

@@ -25,30 +25,13 @@
  *********************************************************/
 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;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo <br/>
- * Description: 返厂旧件列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "返厂旧件列表 视图数据详情", description = "返厂旧件列表 视图数据详情")
 public class AsOldpartreturnDetailsVo implements Vo {

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java

@@ -25,28 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnapply;
 
-
 import com.yxt.common.core.query.Query;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnApplyQuery.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery <br/>
- * Description: 旧件返厂申请 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:49 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
 public class AsOldpartreturnApplyQuery implements Query {

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java

@@ -25,26 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnconfirm;
 
-
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmQuery.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery <br/>
- * Description: 旧件返厂厂家确认 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:00 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
 public class AsOldpartreturnConfirmQuery implements Query {

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnconfirm;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
@@ -37,19 +36,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo <br/>
- * Description: 旧件返厂厂家确认 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:00 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
 public class AsOldpartreturnConfirmVo implements Vo {

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

@@ -58,7 +58,7 @@
         FROM
                 as_busrepair_inventorybill_detail ad
                         LEFT JOIN as_busrepair_inventorybill ai
-                        ON ad.`billSid` = ai.`sid`
+                        ON ad.billSid = ai.sid
         WHERE ai.sourceBillSid = #{repairBillSid}
           AND ad.oldGoodsSkuCode = #{goodsSkuCode}
                 LIMIT 1
@@ -90,7 +90,7 @@
                         LEFT JOIN as_busrepair_inventorybill AS b
                         ON b.sid = d.billSid
                         LEFT JOIN yxt_wms.wms_warehouse_rack wr
-                        ON d.warehouseRackSid = wr.`sid`
+                        ON d.warehouseRackSid = wr.sid
                         LEFT JOIN yxt_wms.wms_warehouse_area wa
                         ON wr.locationSid = wa.sid
         WHERE b.sourceBillSid = #{busRepairBillSid}

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

@@ -39,19 +39,6 @@ import org.apache.ibatis.annotations.Update;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnApplyMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyMapper <br/>
- * Description: 旧件返厂申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> {
 
@@ -66,8 +53,8 @@ public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnAp
     List<AsOldpartreturnDetailExcelVo> downloadTobeOutExcel(String sid);
 
     @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
-	void updateState(@Param("sid") String sid,@Param("state") String state);
+    void updateState(@Param("sid") String sid, @Param("state") String state);
 
     @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
-    void updateStateByBillNo(@Param("billNo") String billNo,@Param("state") String state);
+    void updateStateByBillNo(@Param("billNo") String billNo, @Param("state") String state);
 }

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

@@ -12,7 +12,7 @@
 		FROM
 		as_oldpartreturn_apply aoa
 		LEFT JOIN as_oldpartreturn AS ao
-		ON aoa.`sid` = ao.`mainSid`
+		ON aoa.sid = ao.mainSid
 		LEFT JOIN as_oldpartreturn_confirm ac
 		ON aoa.billNo = ac.billNo
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid

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

@@ -54,23 +54,10 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyRest <br/>
- * Description: 旧件返厂申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "旧件返厂申请")
 @RestController
 @RequestMapping("v1/asoldpartreturnapply")
-public class AsOldpartreturnApplyRest{
+public class AsOldpartreturnApplyRest {
 
     @Autowired
     private AsOldpartreturnApplyService asOldpartreturnApplyService;
@@ -79,7 +66,7 @@ public class AsOldpartreturnApplyRest{
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnApplyVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnApplyQuery> pq){
+    public ResultBean<PagerVo<AsOldpartreturnApplyVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<AsOldpartreturnApplyVo> pv = asOldpartreturnApplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -87,7 +74,7 @@ public class AsOldpartreturnApplyRest{
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto){
+    public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         asOldpartreturnApplyService.saveOrUpdateDto(dto);
         return rb.success();
@@ -95,7 +82,7 @@ public class AsOldpartreturnApplyRest{
 
     @ApiOperation("下载待出库旧件明细")
     @PostMapping("/downloadTobeOutExcel/{sid}")
-	public void downloadTobeOutExcel(@PathVariable("sid") String sid){
+    public void downloadTobeOutExcel(@PathVariable("sid") String sid) {
         //得到所有要导出的数据
         List<AsOldpartreturnDetailExcelVo> exportVoList = asOldpartreturnApplyService.downloadTobeOutExcel(sid);
         //定义导出的excel名字
@@ -111,13 +98,13 @@ public class AsOldpartreturnApplyRest{
 
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return asOldpartreturnApplyService.delAll(sids);
     }
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldpartreturnApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<AsOldpartreturnApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         AsOldpartreturnApplyDetailsVo vo = asOldpartreturnApplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

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

@@ -205,6 +205,9 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		if (StringUtils.isNotBlank(query.getBillNo())){
 			qw.like("aoa.billNo",query.getBillNo());
 		}
+		if (StringUtils.isNotBlank(query.getConfirmResult())){
+			qw.like("ac.state",query.getConfirmResult());
+		}
 		qw.groupBy("aoa.sid");
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
@@ -688,6 +691,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());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java

@@ -37,19 +37,6 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
 
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper <br/>
- * Description: 旧件返厂厂家确认. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> {
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml

@@ -12,7 +12,7 @@
 		FROM
 		as_oldpartreturn_confirm aoc
 		LEFT JOIN as_oldpartreturn_confirm_detail AS aod
-		ON aoc.`sid` = aod.`mainSid`
+		ON aoc.sid = aod.mainSid
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java

@@ -38,19 +38,6 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
 import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmFeignFallback.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest <br/>
- * Description: 旧件返厂厂家确认. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "旧件返厂厂家确认")
 @RestController
 @RequestMapping("v1/asoldpartreturnconfirm")
@@ -61,7 +48,7 @@ public class AsOldpartreturnConfirmRest {
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq){
+    public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -69,7 +56,7 @@ public class AsOldpartreturnConfirmRest {
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
-	public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto){
+    public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto) {
         ResultBean rb = ResultBean.fireFail();
         asOldpartreturnConfirmService.saveOrUpdateDto(dto);
         return rb.success();
@@ -77,7 +64,7 @@ public class AsOldpartreturnConfirmRest {
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java

@@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmService.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService <br/>
- * Description: 旧件返厂厂家确认 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> {
 
@@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("aoc.billNo", query.getBillNo());
         }
+        if (StringUtils.isNotBlank(query.getConfirmResult())) {
+            qw.like("aoc.state", query.getConfirmResult());
+        }
         qw.groupBy("aoc.sid");
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
@@ -208,6 +198,7 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
         }
         AsOldpartreturnConfirm entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setState(2);
         baseMapper.updateById(entity);
     }
 

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;
     //库位编码

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.supplierSid,
-        wi.billObjName AS supplierName,
+        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
@@ -583,7 +589,7 @@
         wa.sid AS warehouseAreaSid,
         wa.areaName AS warehouseAreaName,
         wi.warehouseRackSid,
-        wr.rackName AS warehouseRackName,
+        wi.warehouseRackCode,
         wi.count,
         ab.billNo AS sourceBillNo,
         av.vinNo

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

@@ -40,8 +40,8 @@ public class WmsInventoryReturnFactSelectList {
     private String warehouseAreaName;
     //库位sid
     private String warehouseRackSid;
-    //库位名称
+    //库位编码
-    private String warehouseRackName;
+    private String warehouseRackCode;
     //库存数量
     private String count;
     //车架号

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

@@ -406,6 +406,9 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     //减少库存
                     inventory.setCount(inventoryCount.subtract(count));
                 }
+                if(StringUtils.isNotBlank(query.getGoodsCode())){
+                    inventory.setGoodsSkuCode(query.getGoodsCode());
+                }
                 baseMapper.updateById(inventory);
             }
         }
@@ -1190,6 +1193,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         }
         qw.like("wi.goodsID", "-O");
         qw.gt("wi.count", 0);
+        qw.groupBy("wi.sid");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryReturnFactSelectList> pagging = baseMapper.returnFactGoodsListPage(page, qw);
         PagerVo<WmsInventoryReturnFactSelectList> p = PagerUtil.pageToVo(pagging, null);

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

@@ -14,4 +14,6 @@ public class WmsUpdateCountQuery {
     private String sid;
     private BigDecimal count;
     private Integer addOrReduce; // 0增加 1减少
+
+    private String goodsCode;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -208,8 +208,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
             qw.eq("d.warehouseArea", query.getWarehouseAreaName());
         }
-        if (StringUtils.isNotBlank(query.getWarehouseRackName())) {
+        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
-            qw.eq("d.warehouseRackName", query.getWarehouseRackName());
+            qw.eq("d.warehouseRackCode", query.getWarehouseRackCode());
         }
         qw.groupBy("d.warehouseRackSid");
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
@@ -357,7 +357,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
             wmsInventoryCheckbillDetailDto.setWarehouseAreaSid(wmsWarehouseArea.getSid());
             wmsInventoryCheckbillDetailDto.setWarehouseArea(wmsWarehouseArea.getAreaName());
             wmsInventoryCheckbillDetailDto.setWarehouseRackSid(wmsInventory.getWarehouseRackSid());
-            wmsInventoryCheckbillDetailDto.setWarehouseRackName(wmsWarehouseRack.getRackName());
+            wmsInventoryCheckbillDetailDto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
             wmsInventoryCheckbillDetailDto.setBookCount(wmsInventory.getCount());
             wmsInventoryCheckbillDetailService.insertByDto(wmsInventoryCheckbillDetailDto);
         }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java

@@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp {
     private String warehouseRackCode;
     @ApiModelProperty("出/退库数量")
     private BigDecimal count;
+
+    private String goodsCode;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml

@@ -179,12 +179,18 @@
     </select>
 
     <select id="getDetailsList" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsVo">
-        select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wib.supplierName as manufacturerName
+       <!-- select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wib.supplierName as manufacturerName
         from wms_inventory wi
                      LEFT JOIN wms_inventory_batch wib
                 ON wi.sid = wib.`inventorySid`
                      LEFT JOIN yxt_4sas.as_busrepair_bill_vech abbv
                 ON wib.billSid = abbv.`billSid`
+        where wi.sid = #{sid}-->
+        select wi.goodsSpuName, wi.goodsSkuCode, wi.warehouseName, wi.warehouseRackCode,abbv.vinNo,wi.manufacturerName
+        from wms_inventory wi
+        left join yxt_4sas.as_busrepair_inventorybill_detail d on d.oldInventorySid = wi.sid
+        LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid
+        LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS abbv ON i.sourceBillSid = abbv.billSid
         where wi.sid = #{sid}
     </select>
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java

@@ -599,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 wmsUpdateCountQuery.setSid(kcSid);
                 wmsUpdateCountQuery.setCount(wmsBusrepairInventorybillDetailOldApp.getCount());
                 wmsUpdateCountQuery.setAddOrReduce(0);
+                wmsUpdateCountQuery.setGoodsCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
                 wmsInventoryService.updateInventoryCount(wmsUpdateCountQuery);
             }else {
                 WmsInventorySaveDto dto = new WmsInventorySaveDto();
@@ -608,7 +609,11 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
                 dto.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
                 dto.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+                if(StringUtils.isNotBlank(wmsBusrepairInventorybillDetailOldApp.getGoodsCode())){
+                    dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
+                }else{
                     dto.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+                }
                 dto.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
                 dto.setManufacturerSid(asBusrepairInventorybillDetail.getManufacturerSid());
                 dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
@@ -645,7 +650,11 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
             wmsInventoryRecord.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
             wmsInventoryRecord.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+            if(StringUtils.isNotBlank(wmsBusrepairInventorybillDetailOldApp.getGoodsCode())){
+                wmsInventoryRecord.setGoodsSkuCode(wmsBusrepairInventorybillDetailOldApp.getGoodsCode());
+            }else{
                 wmsInventoryRecord.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+            }
             wmsInventoryRecord.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
             wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
             wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());