修改

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 {
@@ -85,8 +68,8 @@ public class AsOldpartreturnDetailsVo implements Vo {
     private String claimBillNo;
     @ApiModelProperty("是否迟返(1是0否)")
     private String isCf;
-	@ApiModelProperty("需返厂数量")
+    @ApiModelProperty("需返厂数量")
     private BigDecimal needReturnCount; // 需返厂数量
-	@ApiModelProperty("实际返厂数量")
+    @ApiModelProperty("实际返厂数量")
     private BigDecimal actualReturnCount; // 实际返厂数量
 }

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/AsOldpartreturnApplyRest.java

@@ -54,137 +54,124 @@ 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{
-
-	@Autowired
-	private AsOldpartreturnApplyService asOldpartreturnApplyService;
-	@Autowired
-	HttpServletResponse response;
-
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnApplyVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnApplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsOldpartreturnApplyVo> pv = asOldpartreturnApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asOldpartreturnApplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@ApiOperation("下载待出库旧件明细")
-	@PostMapping("/downloadTobeOutExcel/{sid}")
-	public void downloadTobeOutExcel(@PathVariable("sid") String sid){
-		//得到所有要导出的数据
-		List<AsOldpartreturnDetailExcelVo> exportVoList = asOldpartreturnApplyService.downloadTobeOutExcel(sid);
-		//定义导出的excel名字
-		String excelName = "待出库旧件明细";
-		String fileNameURL = "";
-		try {
-			fileNameURL = URLEncoder.encode(excelName, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		ExportExcelUtils.export(fileNameURL, exportVoList, AsOldpartreturnDetailExcelVo.class, response);
-	}
-
-	@ApiOperation("根据sid批量删除")
+public class AsOldpartreturnApplyRest {
+
+    @Autowired
+    private AsOldpartreturnApplyService asOldpartreturnApplyService;
+    @Autowired
+    HttpServletResponse response;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsOldpartreturnApplyVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnApplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsOldpartreturnApplyVo> pv = asOldpartreturnApplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        asOldpartreturnApplyService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @ApiOperation("下载待出库旧件明细")
+    @PostMapping("/downloadTobeOutExcel/{sid}")
+    public void downloadTobeOutExcel(@PathVariable("sid") String sid) {
+        //得到所有要导出的数据
+        List<AsOldpartreturnDetailExcelVo> exportVoList = asOldpartreturnApplyService.downloadTobeOutExcel(sid);
+        //定义导出的excel名字
+        String excelName = "待出库旧件明细";
+        String fileNameURL = "";
+        try {
+            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ExportExcelUtils.export(fileNameURL, exportVoList, AsOldpartreturnDetailExcelVo.class, response);
+    }
+
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return asOldpartreturnApplyService.delAll(sids);
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return asOldpartreturnApplyService.delAll(sids);
+    }
 
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldpartreturnApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		AsOldpartreturnApplyDetailsVo vo = asOldpartreturnApplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@ApiOperation("提交审批流程")
-	@PostMapping("/submit")
-	public ResultBean submit(@RequestBody @Valid SubmitAsOldpartreturnApplyDto dto) {
-		return asOldpartreturnApplyService.submit(dto);
-	}
-
-	@ApiOperation(value = "办理（同意）")
-	@PostMapping("/complete")
-	public ResultBean complete(@Valid @RequestBody AsOldpartreturnApplyCompleteDto query) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.ASOLDPARTRETURNAPPLY.getProDefId());
-		return asOldpartreturnApplyService.complete(bv);
-	}
-
-	@ApiOperation(value = "获取上一个环节")
-	@GetMapping(value = "/getPreviousNodesForReject")
-	public ResultBean<List<AsOldpartreturnApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
-		return asOldpartreturnApplyService.getPreviousNodesForReject(query);
-	}
-
-	@ApiOperation(value = "获取下一个环节")
-	@GetMapping(value = "/getNextNodesForSubmit")
-	public ResultBean<List<AsOldpartreturnApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
-		return asOldpartreturnApplyService.getNextNodesForSubmit(query);
-	}
-
-	@ApiOperation(value = "驳回任务")
-	@PostMapping(value = "/reject")
-	public ResultBean reject(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
-		return asOldpartreturnApplyService.reject(query);
-	}
-
-	@ApiOperation(value = "撤回流程")
-	@PostMapping(value = "/revokeProcess")
-	public ResultBean revokeProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
-		return asOldpartreturnApplyService.revokeProcess(query);
-	}
-
-	@ApiOperation(value = "终止任务")
-	@PostMapping(value = "/breakProcess")
-	public ResultBean breakProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
-		return asOldpartreturnApplyService.breakProcess(query);
-	}
-
-	@ApiOperation(value = "加签")
-	@PostMapping(value = "/delegate")
-	public ResultBean delegate(@RequestBody AsOldpartreturnApplyDelegateQuery query) {
-		return asOldpartreturnApplyService.delegate(query);
-	}
-
-	@PostMapping("/downloadModPriceExcel")
-	@ApiOperation(value = "下载模板")
-	@ResponseBody
-	public void downloadExcel() {
-		asOldpartreturnApplyService.downloadExcel();
-	}
-
-	@PostMapping("/getExcelInfo")
-	@ResponseBody
-	@ApiOperation(value = "导入")
-	public ResultBean<List<AsOldpartreturnDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
-		return asOldpartreturnApplyService.getExcelInfo(file, request);
-	}
+    public ResultBean<AsOldpartreturnApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsOldpartreturnApplyDetailsVo vo = asOldpartreturnApplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @ApiOperation("提交审批流程")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody @Valid SubmitAsOldpartreturnApplyDto dto) {
+        return asOldpartreturnApplyService.submit(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody AsOldpartreturnApplyCompleteDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.ASOLDPARTRETURNAPPLY.getProDefId());
+        return asOldpartreturnApplyService.complete(bv);
+    }
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    public ResultBean<List<AsOldpartreturnApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
+        return asOldpartreturnApplyService.getPreviousNodesForReject(query);
+    }
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    public ResultBean<List<AsOldpartreturnApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
+        return asOldpartreturnApplyService.getNextNodesForSubmit(query);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+        return asOldpartreturnApplyService.reject(query);
+    }
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+        return asOldpartreturnApplyService.revokeProcess(query);
+    }
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+        return asOldpartreturnApplyService.breakProcess(query);
+    }
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody AsOldpartreturnApplyDelegateQuery query) {
+        return asOldpartreturnApplyService.delegate(query);
+    }
+
+    @PostMapping("/downloadModPriceExcel")
+    @ApiOperation(value = "下载模板")
+    @ResponseBody
+    public void downloadExcel() {
+        asOldpartreturnApplyService.downloadExcel();
+    }
+
+    @PostMapping("/getExcelInfo")
+    @ResponseBody
+    @ApiOperation(value = "导入")
+    public ResultBean<List<AsOldpartreturnDetailsVo>> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+        return asOldpartreturnApplyService.getExcelInfo(file, request);
+    }
 }

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

@@ -583,7 +583,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

@@ -1190,6 +1190,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/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())) {
-            qw.eq("d.warehouseRackName", query.getWarehouseRackName());
+        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
+            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);
         }