修改旧件库存查询

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java

@@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +35,15 @@ public class GoodsDetailsVo implements Vo {
     private String warehouseName;
     //库位编号
     private String warehouseRackCode;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 //
 //    @ApiModelProperty("需求数量（维修工单中）")
 //    private String needCount;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@@ -112,4 +112,13 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private String billBusTypeKey;
     @ApiModelProperty("业务类型Value")
     private String billBusTypeValue;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -48,6 +46,15 @@ public class AsBusrepairInventorybillDetailSDto {
     private String warehouseRackSid;
     @ApiModelProperty("库位编号")
     private String warehouseRackCode;
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
+
 
     @ApiModelProperty("需求数量")
     private String needCount;

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java

@@ -43,6 +43,15 @@ public class SalesGoodsVo {
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
+
     //规格型号
     private String goodsSkuOwnSpec;
     //仓库Sid

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -115,8 +115,10 @@
         i.supplierSid as billObjSid,
         i.warehouseSid,
         i.warehouseName,
-        wa.sid as areaSid,
-        wa.areaName,
+        wa.sid as wareAreaSid,
+        wa.areaName wareAreaName,
+        wz.sid wareZoneSid,
+        wz.zoneName wareZoneName,
         i.warehouseRackSid,
         i.warehouseRackCode,
         IF( IFNULL(i.taxRate,0) > 0, '0', '1' ) AS isTaxRate,
@@ -128,6 +130,7 @@
         LEFT JOIN yxt_wms.wms_warehouse_rack as ra ON ra.sid = i.warehouseRackSid
         LEFT JOIN yxt_wms.wms_warehouse_area as wa ON ra.locationSid = wa.sid
         LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid
+        LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = ra.zoneSid
         LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = i.goodsID
         <where>${ew.sqlSegment}</where>
     </select>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@@ -409,6 +409,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                     if (StringUtils.isNotBlank(smsSalesBillDetail.getSupplierName())) {
                         salesGoodsVo.setBillObjName(smsSalesBillDetail.getSupplierName());
                     }
+                    if (StringUtils.isNotBlank(smsSalesBillDetail.getWareAreaSid())) {
+                        salesGoodsVo.setAreaSid(smsSalesBillDetail.getWareAreaSid());
+                    }
+                    if (StringUtils.isNotBlank(smsSalesBillDetail.getWareAreaName())) {
+                        salesGoodsVo.setAreaName(smsSalesBillDetail.getWareAreaName());
+                    }
                     goodsVos.add(salesGoodsVo);
                 }
                 vo.setGoodsVos(goodsVos);
@@ -443,14 +449,6 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                 }
                 vo.setAitemVos(aitemVos);
             }
-
-//            SettlementVo settlementVo = new SettlementVo();
-//            FmsReceivesettle receivesettle = fmsReceivesettleFeign.fetchBySourceSid(sid).getData();
-//            if (null != receivesettle) {
-//                BeanUtil.copyProperties(receivesettle, settlementVo);
-//                settlementVo.setSettleTime(DateUtil.formatDate(receivesettle.getSettleTime()));
-//                vo.setSettlementVo(settlementVo);
-//            }
         }
         return vo;
     }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java

@@ -48,6 +48,15 @@ public class SmsWmsInventorySalesVo implements Vo {
      */
     private String areaName;
     private String areaSid;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     /**
      * 供应商
      */

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java

@@ -88,10 +88,14 @@ public class SmsSalesBillDetail extends BaseEntity {
     private String warehouseSid;
     //仓库
     private String warehouseName;
-    //库区sid
-    private String areaSid;
-    //库区
-    private String areaName;
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     //库位sid
     private String warehouseRackSid;
     //库位编码

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

@@ -261,6 +261,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a.vinNo", query.getVinNo());
         }
+        if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+            qw.like("a.sourceBillNo", query.getSourceBillNo());
+        }
         IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOldInventoryPageListVo> pagging = baseMapper.oldPageList(page, qw);
         PagerVo<WmsOldInventoryPageListVo> p = PagerUtil.pageToVo(pagging, null);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java

@@ -36,7 +36,14 @@ public class WmsOutBillInventoryVo {
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     private String price;//销售单价
     private String cost;//入库单价
     private String outboundCount;// 已出库数量

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@@ -43,6 +43,10 @@
         wi.warehouseName,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
+        wa.sid wareAreaSid,
+        wa.areaName wareAreaName,
+        wz.sid wareZoneSid,
+        wz.zoneName wareZoneName,
         wi.count,
         wi.sid inventorySid,
         wi.supplierName,
@@ -50,6 +54,9 @@
         s.price as money
         from wms_inventory wi
         LEFT JOIN yxt_wms.wms_warehouse_info as wh ON wh.sid = wi.warehouseSid
+        LEFT JOIN yxt_wms.wms_warehouse_rack as wr ON wr.sid = wi.warehouseRackSid
+        LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.sid = wr.locationSid
+        LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = wr.zoneSid
         LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = wi.goodsID
         <where>
             ${ew.sqlSegment}