From 62dafd52def3b8adaeac589db3065f7a05d95925 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 19 Jul 2024 09:21:10 +0800
Subject: [PATCH] 7/19

---
 .../warehouse/biz/warehousearea/WarehouseAreaMapper.xml    | 2 +-
 .../warehouse/biz/warehousearea/WarehouseAreaService.java  | 7 ++++---
 .../biz/warehouseareatype/WarehouseAreaTypeMapper.xml      | 2 +-
 .../biz/warehouseareatype/WarehouseAreaTypeService.java    | 4 +---
 .../warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml    | 2 +-
 .../warehouse/biz/warehouseinfo/WarehouseInfoService.java  | 7 ++++---
 .../warehouse/biz/warehouserack/WarehouseRackMapper.xml    | 2 +-
 .../warehouse/biz/warehouserack/WarehouseRackService.java  | 4 +---
 .../biz/warehouseregion/WarehouseRegionMapper.xml          | 2 +-
 .../biz/warehouseregion/WarehouseRegionService.java        | 4 +---
 10 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
index 24cc6d5..fc3d2db 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
@@ -21,7 +21,7 @@
         from warehouse_area a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
index 9e710fb..c67bc77 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
@@ -84,6 +84,9 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
     public ResultBean<String> saveOrUpdate(WarehouseAreaDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
+        if(StringUtils.isBlank(dto.getVolume())){
+            dto.setVolume("0");
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
             WarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
@@ -96,8 +99,7 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setCreateTime(new DateTime());
             wmsWarehouseArea.setCreateBySid(dto.getUserSid());
-            wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
-            wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
+            wmsWarehouseArea.setCreateOrgSid(dto.getUseOrgSid());
             baseMapper.insert(wmsWarehouseArea);
         }
         return rb.success().setMsg("成功");
@@ -106,7 +108,6 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
     public ResultBean<WarehouseAreaVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaVo vo = baseMapper.initialization(sid);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
index 5cebb50..ff66b71 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
@@ -19,7 +19,7 @@
         from warehouse_area_type a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
index c54ba51..a99bb6a 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
@@ -86,8 +86,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
             BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
             wmsWarehouseArea.setCreateTime(new DateTime());
             wmsWarehouseArea.setCreateBySid(dto.getUserSid());
-            wmsWarehouseArea.setCreateOrgSid(dto.getOrgPath());
-            wmsWarehouseArea.setUseOrgSid(dto.getOrgPath());
+            wmsWarehouseArea.setCreateOrgSid(dto.getUseOrgSid());
             baseMapper.insert(wmsWarehouseArea);
         }
         return rb.success().setMsg("成功");
@@ -96,7 +95,6 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
     public ResultBean<WarehouseAreaTypeVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaTypeVo vo = baseMapper.initialization(sid);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
index dbe4970..01b48a0 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
@@ -19,7 +19,7 @@
         from warehouse_info a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
index 881c378..9199772 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -91,6 +91,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
+        if(StringUtils.isBlank(dto.getTelephone())){
+
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
             WarehouseInfo wmsWarehouse = fetchBySid(dto.getSid());
@@ -110,8 +113,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
             wmsWarehouse.setCreateTime(new DateTime());
             wmsWarehouse.setCreateBySid(dto.getUserSid());
-            wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
-            wmsWarehouse.setUseOrgSid(dto.getOrgPath());
+            wmsWarehouse.setCreateOrgSid(dto.getUseOrgSid());
             baseMapper.insert(wmsWarehouse);
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -140,7 +142,6 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             list1.add(vo1);
         }
         vo.setWmsWarehouseExtendVos(list1);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
index 07d435e..2d02dc2 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
@@ -21,7 +21,7 @@
         from warehouse_rack a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
index 5dc00c2..6b50c35 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
@@ -95,8 +95,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
             BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
             wmsWarehouseRack.setCreateTime(new DateTime());
             wmsWarehouseRack.setCreateBySid(dto.getUserSid());
-            wmsWarehouseRack.setCreateOrgSid(dto.getOrgPath());
-            wmsWarehouseRack.setUseOrgSid(dto.getOrgPath());
+            wmsWarehouseRack.setCreateOrgSid(dto.getUseOrgSid());
             baseMapper.insert(wmsWarehouseRack);
         }
         return rb.success().setMsg("成功");
@@ -105,7 +104,6 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     public ResultBean<WarehouseRackVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseRackVo vo = baseMapper.initialization(sid);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml
index 84bfade..7c1768c 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionMapper.xml
@@ -18,7 +18,7 @@
         from warehouse_region a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java
index b5cc6c4..ece3d28 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseregion/WarehouseRegionService.java
@@ -85,8 +85,7 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
             BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
             wmsWarehouse.setCreateTime(new DateTime());
             wmsWarehouse.setCreateBySid(dto.getUserSid());
-            wmsWarehouse.setCreateOrgSid(dto.getOrgPath());
-            wmsWarehouse.setUseOrgSid(dto.getOrgPath());
+            wmsWarehouse.setCreateOrgSid(dto.getUseOrgSid());
             baseMapper.insert(wmsWarehouse);
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
@@ -115,7 +114,6 @@ public class WarehouseRegionService extends MybatisBaseService<WarehouseRegionMa
             list1.add(vo1);
         }
         vo.setWmsWarehouseExtendVos(list1);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }