修改

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/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,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-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);
         }