Merge remote-tracking branch 'origin/master'

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

@@ -28,24 +28,13 @@ package com.yxt.anrui.as.api.asoldparthandleapply;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApply.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply <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_apply")
@@ -84,7 +73,7 @@ public class AsOldparthandleApply extends BaseEntity {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandleapply;
 
-
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 import com.yxt.common.core.vo.Vo;
@@ -40,19 +39,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <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 AsOldparthandleApplyDetailsVo implements Vo {
@@ -98,7 +84,7 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
     @ApiModelProperty("待处理旧件列表")

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandleapply;
 
-
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 import com.yxt.common.core.dto.Dto;
 
@@ -39,19 +38,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyDto.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto <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 AsOldparthandleApplyDto implements Dto {
@@ -97,7 +83,7 @@ public class AsOldparthandleApplyDto implements Dto {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
     @ApiModelProperty("待处理旧件列表")

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandleapply;
 
-
 import com.yxt.common.core.query.Query;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -34,19 +33,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyQuery.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery <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 AsOldparthandleApplyQuery implements Query {

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

@@ -25,28 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldparthandleapply;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <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 AsOldparthandleApplyVo implements Vo {

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

@@ -38,25 +38,9 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper <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 AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> {
 
-	//@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}")
-	//IPage<AsOldparthandleApplyVo> voPage(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandleApply> qw);
-	
     IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
 
     List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);

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

@@ -47,19 +47,6 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyRest <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
- */
 @Api(tags = "旧件处理申请")
 @RestController
 @RequestMapping("v1/asoldparthandleapply")
@@ -70,7 +57,7 @@ public class AsOldparthandleApplyRest {
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq){
+    public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -78,7 +65,7 @@ public class AsOldparthandleApplyRest {
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody AsOldparthandleApplyDto dto){
+    public ResultBean save(@RequestBody AsOldparthandleApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         asOldparthandleApplyService.saveOrUpdateDto(dto);
         return rb.success();
@@ -86,13 +73,13 @@ public class AsOldparthandleApplyRest {
 
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return asOldparthandleApplyService.delAll(sids);
     }
 
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

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

@@ -33,12 +33,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
 import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
 import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
-import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
-import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApply;
-import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery;
-import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
-import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
 import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService;
 import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.*;
@@ -74,19 +68,6 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: yxt-as(旧件处理申请) <br/>
- * File: AsOldparthandleApplyService.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyService <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
- */
 @Service
 public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> {
 
@@ -152,23 +133,23 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
                 return p;
             }
         }
-		if (StringUtils.isNotBlank(query.getUseOrgName())){
-			qw.like("aoa.useOrgName",query.getUseOrgName());
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("aoa.useOrgName", query.getUseOrgName());
         }
-		if (StringUtils.isNotBlank(query.getCreateDeptName())){
-			qw.like("aoa.deptName",query.getCreateDeptName());
+        if (StringUtils.isNotBlank(query.getCreateDeptName())) {
+            qw.like("aoa.deptName", query.getCreateDeptName());
         }
-		if (StringUtils.isNotBlank(query.getCreateByName())){
-			qw.like("aoa.createByName",query.getCreateByName());
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("aoa.createByName", query.getCreateByName());
         }
-		if (StringUtils.isNotBlank(query.getBillNo())){
-			qw.like("aoa.billNo",query.getBillNo());
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("aoa.billNo", query.getBillNo());
         }
-		if (StringUtils.isNotBlank(query.getHandleReasonKey())){
-			qw.like("aoa.handleReasonKey",query.getHandleReasonKey());
+        if (StringUtils.isNotBlank(query.getHandleReasonKey())) {
+            qw.like("aoa.handleReasonKey", query.getHandleReasonKey());
         }
-		if (StringUtils.isNotBlank(query.getHandleModeKey())){
-			qw.like("aoa.handleModeKey",query.getHandleModeKey());
+        if (StringUtils.isNotBlank(query.getHandleModeKey())) {
+            qw.like("aoa.handleModeKey", query.getHandleModeKey());
         }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
@@ -188,7 +169,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
         return p;
     }
 
-	public String saveOrUpdateDto(AsOldparthandleApplyDto dto){
+    public String saveOrUpdateDto(AsOldparthandleApplyDto dto) {
         String dtoSid = dto.getSid();
         List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList();
         String deptSid = dto.getDeptSid();
@@ -225,7 +206,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
         return dtoSid;
     }
 
-	public String insertByDto(AsOldparthandleApplyDto dto){
+    public String insertByDto(AsOldparthandleApplyDto dto) {
         AsOldparthandleApply entity = new AsOldparthandleApply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         List<String> filePaths = dto.getFilePaths();
@@ -240,7 +221,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
         return entity.getSid();
     }
 
-	public void updateByDto(AsOldparthandleApplyDto dto){
+    public void updateByDto(AsOldparthandleApplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -250,7 +231,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan
         baseMapper.updateById(entity);
     }
 
-	public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid){
+    public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid) {
         AsOldparthandleApply entity = fetchBySid(sid);
         AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);

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

@@ -11,6 +11,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
@@ -69,6 +71,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     @Autowired
     private AsBusrepairBillFeign asBusrepairBillFeign;
 
+    @Autowired
+    private WmsWarehouseInfoService wmsWarehouseInfoService;
+
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
@@ -594,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
             WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
             String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
+            WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseRack.getWarehouseSid());
             if (StringUtils.isNotBlank(kcSid)){
                 WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
                 wmsUpdateCountQuery.setSid(kcSid);
@@ -619,8 +625,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
                 dto.setUnit(asBusrepairInventorybillDetail.getUnit());
                 dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
-                dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-                dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+                dto.setWarehouseSid(warehouseInfo.getSid());
+                dto.setWarehouseName(warehouseInfo.getWarehouseName());
                 dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
                 dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
                 dto.setFirstInDate(DateUtil.today());
@@ -659,8 +665,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
             wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());
             wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
-            wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-            wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+            wmsInventoryRecord.setWarehouseSid(warehouseInfo.getSid());
+            wmsInventoryRecord.setWarehouseName(warehouseInfo.getWarehouseName());
             wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
             wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();