完善下拉选择仓库

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java

@@ -4,6 +4,7 @@ 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.wmswarehousearea.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,8 @@ public class WmsWarehouseAreaRest {
     }
     @ApiOperation("查询所有的库区")
     @GetMapping("/listAll")
-    public ResultBean<WmsWarehouseAreaVo> listAll() {
-        return wmsWarehouseAreaService.getAllType();
+    public ResultBean<List<WmsWarehouseArea>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseAreaService.getAllType(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java

@@ -3,15 +3,15 @@ package com.yxt.wms.apiadmin.base;
 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.wmswarehouseareatype.WmsWarehouseAreaTypeDto;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeQuery;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeService;
-import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo;
+import com.yxt.wms.biz.base.wmswarehouseareatype.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/3/18 14:57
@@ -31,8 +31,8 @@ public class WmsWarehouseAreaTypeRest {
     }
     @ApiOperation("查询所有的")
     @GetMapping("/listAll")
-    public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
-        return wmsWarehouseAreaTypeService.listAll();
+    public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseAreaTypeService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
 import com.yxt.wms.biz.base.wmswarehouseinfo.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,8 @@ public class WmsWarehouseInfoRest {
     }
     @ApiOperation("查询所有的仓库")
     @GetMapping("/listAll")
-    public ResultBean<WmsWarehouseInfoVo> listAll() {
-        return wmsWarehouseService.listAll();
+    public ResultBean<List<WmsWarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseService.listAll(query);
     }
 
     @ApiOperation("保存修改")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java

@@ -25,4 +25,6 @@ public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
     WmsWarehouseArea checkForInsert(@Param("areaCode")String areaCode, @Param("warehouseSid")String warehouseSid);
 
     WmsWarehouseArea checkForUpdate(@Param("areaCode")String areaCode,@Param("warehouseSid") String warehouseSid, @Param("sid")String sid);
+
+    List<WmsWarehouseArea> listAll(@Param("useOrgSid") String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml

@@ -6,7 +6,7 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
         select
-            a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
+        a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
         from wms_warehouse_area a
         left join wms_warehouse_info b on b.sid=a.warehouseSid
         left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
@@ -16,22 +16,40 @@
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
-        select
-        a.*,a.createBySid as userSid,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
+        select a.*,
+               a.createBySid           as userSid,
+               b.warehouseName         as warehouseName,
+               c.warehouseAreaTypeName as areaTypeName
         from wms_warehouse_area a
-        left join wms_warehouse_info b on b.sid=a.warehouseSid
-        left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
+                 left join wms_warehouse_info b on b.sid = a.warehouseSid
+                 left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
 
-        where a.sid =#{sid}
+        where a.sid = #{sid}
     </select>
     <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
-        select * from wms_warehouse_area where areaCode =#{areaCode} and warehouseSid =#{warehouseSid} and isDelete=0
+        select *
+        from wms_warehouse_area
+        where areaCode = #{areaCode}
+          and warehouseSid = #{warehouseSid}
+          and isDelete = 0
     </select>
     <select id="checkForUpdate" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
-        select * from wms_warehouse_area where areaCode =#{areaCode} and warehouseSid =#{warehouseSid} and sid !=#{sid} and isDelete=0
+        select *
+        from wms_warehouse_area
+        where areaCode = #{areaCode}
+          and warehouseSid = #{warehouseSid}
+          and sid !=#{sid}
+          and isDelete=0
+    </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">
+        select a.*
+        from wms_warehouse_area a
+                 left join wms_warehouse_info b on b.sid = a.warehouseSid
+        where b.useOrgSid = #{useOrgSid}
+          and a.isDelete = 0
     </select>
     <update id="updateBySidIsDelete">
-        UPDATE  wms_warehouse_area
+        UPDATE wms_warehouse_area
         SET isDelete=1
         where sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java

@@ -10,12 +10,17 @@ 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.WmsWarehouseInfoVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -30,6 +35,8 @@ import java.util.stream.Collectors;
 public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseAreaMapper, WmsWarehouseArea> {
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -91,11 +98,23 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         return rb.success().setData(p);
     }
 
-    public ResultBean<WmsWarehouseAreaVo> getAllType() {
+    public ResultBean<List<WmsWarehouseArea>> getAllType(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable", 1)
-                .ne("isDelete", "1"));
-        return rb.success().setData(pagging);
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseArea> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseAreaDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java

@@ -23,4 +23,6 @@ public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaT
     WmsWarehouseAreaType checkCode(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid") String deptSid);
 
     WmsWarehouseAreaType checkCodeForUpdate(@Param("warehouseAreaTypeName")String warehouseAreaTypeName, @Param("deptSid")String useOrgSid, @Param("sid")String sid);
+
+    List<WmsWarehouseAreaType> listAll(@Param("useOrgSid")String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml

@@ -23,7 +23,8 @@
         select *
         from wms_warehouse_area_type
         where warehouseAreaTypeName = #{warehouseAreaTypeName}
-          and useOrgSid = #{deptSid} and isDelete=0
+          and useOrgSid = #{deptSid}
+          and isDelete = 0
     </select>
     <select id="checkCodeForUpdate"
             resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
@@ -31,7 +32,14 @@
         from wms_warehouse_area_type
         where warehouseAreaTypeName = #{warehouseAreaTypeName}
           and useOrgSid = #{deptSid}
-        and sid != #{sid} and isDelete=0
+          and sid != #{sid}
+          and isDelete=0
+    </select>
+    <select id="listAll" resultType="com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaType">
+        select a.*
+        from wms_warehouse_area_type a
+        where a.useOrgSid = #{useOrgSid}
+          and a.isDelete = 0
     </select>
     <update id="updateBySidIsDelete">
         UPDATE wms_warehouse_area_type

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java

@@ -10,6 +10,7 @@ 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.wmswarehousearea.WmsWarehouseArea;
 import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
@@ -17,8 +18,10 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -87,11 +90,23 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
         List<WmsWarehouseAreaTypeVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
+    public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
-                .ne("isDelete","1"));
-        return rb.success().setData(pagging);
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseAreaType> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseAreaTypeDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@@ -21,10 +21,14 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
     IPage<WmsWarehouseInfoVo> listPage(IPage<WmsWarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseInfo> qw);
 
     int updateBySidIsDelete(List<String> list);
+
     @Select("select * from wms_warehouse_info")
     List<WmsWarehouseAreaAllVo> selectAll();
 
-    WmsWarehouseInfo checkCode(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid")String useOrgSid);
+    WmsWarehouseInfo checkCode(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid);
+
+    WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
 
-    WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode")String warehouseCode,@Param("useOrgSid") String useOrgSid, @Param("sid")String sid);
+    @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus '1' ")
+    List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -19,6 +19,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -100,10 +101,23 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         List<WmsWarehouseInfoVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<WmsWarehouseInfoVo> listAll() {
+    public ResultBean<List<WmsWarehouseInfo>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseInfo> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseInfo>().eq("isEnable",1));
-        return rb.success().setData(pagging);
+        String useOrgSid = "";
+        String orgPath = query.getOrgPath();
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        List<WmsWarehouseInfo> list = baseMapper.listAll(useOrgSid);
+        return rb.success().setData(list);
     }
 
     public ResultBean<String> saveOrUpdate(WmsWarehouseInfoDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.wms.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/17 14:15
+ */
+@Data
+public class OrgPathQuery {
+    private String orgPath;
+}