Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue

@@ -37,7 +37,7 @@
         <el-row>
           <el-col :span="4">
             <el-form-item>
-              <span><span class="icon">*</span>上传买断证明</span>
+              <span>上传买断证明</span>
             </el-form-item>
           </el-col>
           <el-col :span="20">

yxt-as-ui/src/api/Common/dictcommons.js

@@ -365,7 +365,7 @@ export function getGoodsCategory(params) {
   })
 }
 
-// 查询分公司orgSidPath下的所有仓库
+// 查询分公司orgSidPath下的所有仓库(可传参数仓库类型)
 export function getAllWarehouse(params) {
   return request({
     url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
@@ -403,3 +403,12 @@ export function getAllRackByKQSid(data) {
     params: data
   })
 }
+
+// 根据仓库sid查询库区
+export function getWarehouseareas(data) {
+  return request({
+    url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+    method: 'get',
+    params: data
+  })
+}

yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js

@@ -23,46 +23,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  },
-  // 选择厂家
-  choiceManufacturer: function(params) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 查询所有仓库
-  getWarehouses: function(params) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 根据仓库查询库区
-  getWarehouseareas: function(data) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-      method: 'get',
-      params: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 根据库区查询库位
-  getAllRackByKQSid: function(data) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid',
-      method: 'get',
-      params: data
-    })
   }
 }

yxt-as-ui/src/api/storage/oldPartsInvertory.js

@@ -40,32 +40,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-    },
-    // 查询所有仓库
-    getWarehouses: function(params) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-            method: 'post',
-            data: params,
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-    },
-    // 根据仓库查询库区
-    getWarehouseareas: function(data) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-            method: 'get',
-            params: data
-        })
-    },
-    // 根据库区查询库位
-    getAllRackByKQSid: function(data) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid',
-            method: 'get',
-            params: data
-        })
   }
 }

yxt-as-ui/src/views/storage/inventory/inventory.vue

@@ -206,7 +206,7 @@ export default {
   },
   methods: {
     init() {
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -303,6 +303,9 @@ export default {
       this.getList()
     },
     selectWarehouseName(val) {
+      this.warehouseZoneList = []
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseList.filter((item) => item.sid === val)
       if (choose !== null || choose.length > 0) {
         this.listQuery.params.warehouseName = choose[0].warehouseName
@@ -313,9 +316,6 @@ export default {
       this.listQuery.params.wareZoneName = ''
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseZoneList = []
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWarehouseZoneList(sid) {
       getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
@@ -325,6 +325,8 @@ export default {
       })
     },
     selectWareZoneName(val) {
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseZoneList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareZoneName = choose[0].zoneName
@@ -334,8 +336,6 @@ export default {
       }
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWareAreaList(sid) {
       getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
@@ -345,6 +345,7 @@ export default {
       })
     },
     selectWareAreaName(val) {
+      this.warehouseRackList = []
       const choose = this.wareAreaList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareAreaName = choose[0].areaName
@@ -353,7 +354,6 @@ export default {
         this.listQuery.params.wareAreaName = ''
       }
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseRackList = []
     },
     getWarehouseRackList(sid) {
       getAllRackByKQSid({ kqSid: sid }).then((res) => {

yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue

@@ -228,7 +228,7 @@ export default {
           this.busType_list = res.data
         }
       })
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -316,6 +316,9 @@ export default {
       this.getList()
     },
     selectWarehouseName(val) {
+      this.warehouseZoneList = []
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseList.filter((item) => item.sid === val)
       if (choose !== null || choose.length > 0) {
         this.listQuery.params.warehouseName = choose[0].warehouseName
@@ -326,9 +329,6 @@ export default {
       this.listQuery.params.wareZoneName = ''
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseZoneList = []
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWarehouseZoneList(sid) {
       getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
@@ -338,6 +338,8 @@ export default {
       })
     },
     selectWareZoneName(val) {
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseZoneList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareZoneName = choose[0].zoneName
@@ -347,8 +349,6 @@ export default {
       }
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWareAreaList(sid) {
       getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
@@ -358,6 +358,7 @@ export default {
       })
     },
     selectWareAreaName(val) {
+      this.warehouseRackList = []
       const choose = this.wareAreaList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareAreaName = choose[0].areaName
@@ -366,7 +367,6 @@ export default {
         this.listQuery.params.wareAreaName = ''
       }
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseRackList = []
     },
     getWarehouseRackList(sid) {
       getAllRackByKQSid({ kqSid: sid }).then((res) => {

yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue

@@ -121,6 +121,7 @@ import req from '@/api/storage/oldPartsInAndOutStorage.js'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import { typeValues } from '@/api/Common/dictcommons'
+import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
 import req2 from '@/api/goods/factory.js'
 
 export default {
@@ -204,7 +205,7 @@ export default {
   },
   methods: {
     init() {
-      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -354,7 +355,7 @@ export default {
       }
     },
     getWarehouseAreaList(sid) {
-      req.getWarehouseareas({ ckSid: sid }).then((res) => {
+      getWarehouseareas({ ckSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseAreaList = res.data
         }
@@ -372,7 +373,7 @@ export default {
       }
     },
     getWareHouseCodeList(sid) {
-      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+      getAllRackByKQSid({ kqSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseRackCodeList = res.data
         }

yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue

@@ -97,6 +97,7 @@ import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import req from '@/api/storage/oldPartsInvertory.js'
 import divInfo from './oldPartsInvertoryInfo.vue'
+import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
 
 export default {
   components: {
@@ -330,7 +331,7 @@ export default {
       this.viewState = 1
     },
     getWarehouseList() {
-      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -350,7 +351,7 @@ export default {
       }
     },
     getWarehouseAreaList(sid) {
-      req.getWarehouseareas({ ckSid: sid }).then((res) => {
+      getWarehouseareas({ ckSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseAreaList = res.data
         }
@@ -368,7 +369,7 @@ export default {
       }
     },
     getWareHouseCodeList(sid) {
-      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+      getAllRackByKQSid({ kqSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseRackCodeList = res.data
         }

yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue

@@ -165,7 +165,7 @@ export default {
   },
   methods: {
     init() {
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -243,6 +243,9 @@ export default {
       this.getList()
     },
     selectWarehouseName(val) {
+      this.warehouseZoneList = []
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseList.filter((item) => item.sid === val)
       if (choose !== null || choose.length > 0) {
         this.listQuery.params.warehouseName = choose[0].warehouseName
@@ -253,9 +256,6 @@ export default {
       this.listQuery.params.wareZoneName = ''
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseZoneList = []
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWarehouseZoneList(sid) {
       getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
@@ -265,6 +265,8 @@ export default {
       })
     },
     selectWareZoneName(val) {
+      this.wareAreaList = []
+      this.warehouseRackList = []
       const choose = this.warehouseZoneList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareZoneName = choose[0].zoneName
@@ -274,8 +276,6 @@ export default {
       }
       this.listQuery.params.wareAreaName = ''
       this.listQuery.params.warehouseRackCode = ''
-      this.wareAreaList = []
-      this.warehouseRackList = []
     },
     getWareAreaList(sid) {
       getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
@@ -285,6 +285,7 @@ export default {
       })
     },
     selectWareAreaName(val) {
+      this.warehouseRackList = []
       const choose = this.wareAreaList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.listQuery.params.wareAreaName = choose[0].areaName
@@ -293,7 +294,6 @@ export default {
         this.listQuery.params.wareAreaName = ''
       }
       this.listQuery.params.warehouseRackCode = ''
-      this.warehouseRackList = []
     },
     getWarehouseRackList(sid) {
       getAllRackByKQSid({ kqSid: sid }).then((res) => {

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

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.inventory.wmsinventory;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -44,5 +45,7 @@ public class FittingsInventoryQuery implements Query {
      * 仓库
      */
     private String warehouseName;
-
+    private String warehouseRackCode;
+    private String wareAreaName;
+    private String wareZoneName;
 }

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

@@ -51,5 +51,8 @@ public class FittingsInventoryVo implements Vo {
      * 仓库
      */
     private String warehouseName;
+    private String warehouseRackCode;
+    private String wareAreaName;
+    private String wareZoneName;
 
 }

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

@@ -16,6 +16,8 @@
         a.manufacturerName,
         a.warehouseName,
         a.warehouseRackCode,
+        wa.areaName wareAreaName,
+        wz.zoneName wareZoneName,
         a.count,
         a.cost,
         a.taxRate tax,
@@ -24,7 +26,10 @@
         FROM
         wms_inventory a
         LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid
-        LEFT JOIN wms_warehouse_info as i ON a.warehouseSid = i.sid
+        LEFT JOIN wms_warehouse_rack as wr ON a.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid
+        LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -452,16 +457,22 @@
         wi.goodsSkuOwnSpec,
         wi.unit,
         wi.warehouseName,
+        wi.warehouseRackCode,
+        wa.areaName wareAreaName,
+        wz.zoneName wareZoneName,
         wi.manufacturerName,
         wi.supplierName billObjName,
         IFNULL(SUM(count),0) as inventoryCount,
         s.orgSidPath
         FROM
         wms_inventory as wi
-        LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid
+        LEFT JOIN wms_warehouse_rack as wr ON wi.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid
+        LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid
         LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid
         LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
-        GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.supplierName) as a
+        GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseRackSid,wi.goodsSkuCode,wi.supplierName) as a
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -25,6 +25,11 @@ public class WmsInventoryQuery implements Query {
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
 
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
+
     @ApiModelProperty("批次号")
     private String batchNumber;
 

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

@@ -115,6 +115,12 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
             qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
         }
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("wa.areaName", query.getWareAreaName());
+        }
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("wz.zoneName", query.getWareZoneName());
+        }
         if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("a.supplierName", query.getSupplierName());
         }
@@ -919,6 +925,15 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
             qw.like("a.warehouseName", query.getWarehouseName());
         }
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("a.wareAreaName", query.getWareAreaName());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
+            qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
+        }
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("a.wareZoneName", query.getWareZoneName());
+        }
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("a.billObjName", query.getName())
                     .or().like("a.deptName", query.getName())
@@ -927,6 +942,9 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("a.manufacturerName", query.getName())
                     .or().like("a.useOrgName", query.getName())
                     .or().like("a.warehouseName", query.getName())
+                    .or().like("a.wareAreaName", query.getName())
+                    .or().like("a.wareZoneName", query.getName())
+                    .or().like("a.warehouseRackCode", query.getName())
             );
         }
         qw.notLike("a.goodsID","-O");

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

@@ -49,4 +49,9 @@ public class WmsInventoryVo implements Vo {
     private String cost;
     @ApiModelProperty("税率")
     private String tax;
+
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml

@@ -96,6 +96,8 @@
         wir.goodsSkuOwnSpec,
         wir.warehouseName,
         wir.warehouseRackCode,
+        wa.areaName wareAreaName,
+        wz.zoneName wareZoneName,
         wir.billNo,
         wir.billType,
         DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
@@ -114,7 +116,10 @@
         ui.`name` createByName
         from wms_inventory_record wir
         LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid
-        LEFT JOIN wms_warehouse_info as i ON wir.warehouseSid = i.sid
+        LEFT JOIN wms_warehouse_rack as wr ON wir.warehouseRackSid = wr.sid
+        LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid
+        LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid
         LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
         LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid
         LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java

@@ -294,10 +294,20 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
             qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
         }
+
+        if (StringUtils.isNotBlank(query.getWareAreaName())) {
+            qw.like("wa.areaName", query.getWareAreaName());
+        }
+
+        if (StringUtils.isNotBlank(query.getWareZoneName())) {
+            qw.like("wz.zoneName", query.getWareZoneName());
+        }
+
         //供应商名称
         if (StringUtils.isNotBlank(query.getSupplierName())) {
             qw.like("wir.supplierName", query.getSupplierName());
         }
+
         //来源单据编号
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("wir.billNo", query.getBillNo());

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java

@@ -22,6 +22,10 @@ public class WmsInventoryRecordsQuery implements Query {
     private String warehouseName;
     @ApiModelProperty("库位编号")
     private String warehouseRackCode;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     @ApiModelProperty("厂家")
     private String manufacturerName;
     @ApiModelProperty("供应商")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java

@@ -29,6 +29,10 @@ public class WmsInventoryRecordsVo {
     private String warehouseRackCode;
     @ApiModelProperty("库区名称")
     private String warehouseAreaName;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     @ApiModelProperty("来源单据编号")
     private String billNo;
     @ApiModelProperty("单据类型（1入库、0出库）")