From 0e12cf10e56c24b22a4f8708a35672dccd84e167 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 19 Dec 2024 14:50:03 +0800
Subject: [PATCH] 12.19

---
 .../com/yxt/warehouse/apiadmin/WarehouseInfoRest.java    | 2 +-
 .../warehouse/biz/warehouseinfo/WarehouseInfoDto.java    | 2 ++
 .../warehouse/biz/warehouseinfo/WarehouseInfoMapper.java | 2 +-
 .../warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml  | 3 +++
 .../biz/warehouseinfo/WarehouseInfoService.java          | 9 ++++-----
 .../yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java | 2 ++
 src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java  | 1 +
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
index 15d2715..5980ddb 100644
--- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
+++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
@@ -54,7 +54,7 @@ public class WarehouseInfoRest {
 
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
-    public ResultBean<String> saveOrUpdate(@RequestBody WarehouseInfoDto dto) {
+    public ResultBean<WarehouseInfo> saveOrUpdate(@RequestBody WarehouseInfoDto dto) {
         return wmsWarehouseService.saveOrUpdate(dto);
     }
 
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
index 9832689..8c84647 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
@@ -21,6 +21,8 @@ public class WarehouseInfoDto implements Dto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
     private String remarks;
+    private String createBySid;
+    private String updateBySid;
     private Integer isEnable;
     private Integer state;
     private Integer isDelete;
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
index d5dd469..4be3821 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
@@ -25,7 +25,7 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     int updateBySidIsDelete(List<String> list);
     @Select("select * from wms_warehouse_info")
     List<WarehouseAreaAllVo> selectAll();
-    List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
+    List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath,@Param("name")String name);
     List<WarehouseInfoVoSheng> getAddressGroup(@Param("orgPath")String orgPath);
     List<WarehouseInfoVo> getAddressGroupByGSD(@Param("belongingPlace")String belongingPlace);
 
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 24a8f65..4b31ec8 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
@@ -44,6 +44,9 @@
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
             s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'  and a.isEnable ='1' and usageStatus='1'
+            <if test="name!=null and name!=''">
+                and a.warehouseName like concat('%',#{name},'%')
+            </if>
         </where>
     </select>
     <select id="getAddressGroup" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVoSheng">
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 e961618..faf37d5 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -245,11 +245,11 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
 
     public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<WarehouseInfoVo> pagging = baseMapper.listAll(query.getOrgPath());
+        List<WarehouseInfoVo> pagging = baseMapper.listAll(query.getOrgPath(),query.getName());
         return rb.success().setData(pagging);
     }
 
-    public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
+    public ResultBean<WarehouseInfo> saveOrUpdate(WarehouseInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
 
@@ -268,6 +268,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
                 dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
                 wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
             }
+            return rb.success().setMsg("成功").setData(wmsWarehouse);
         } else {
             WarehouseInfo wmsWarehouse = new WarehouseInfo();
             sid = wmsWarehouse.getSid();
@@ -284,10 +285,8 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
                 dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
                 wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
             }
-
+            return rb.success().setMsg("成功").setData(wmsWarehouse);
         }
-
-        return rb.success().setMsg("成功");
     }
 
     public ResultBean<WarehouseInfoVo> initialization(String sid) {
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java
index 6e908d4..b748b0e 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java
@@ -22,6 +22,8 @@ public class WarehouseInfoVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
     private String remarks;
+    private String createBySid;
+    private String updateBySid;
     private Integer isEnable;
     private Integer state;
     private Integer isDelete;
diff --git a/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java b/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java
index 440f972..9caff19 100644
--- a/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java
+++ b/src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java
@@ -11,4 +11,5 @@ import lombok.Data;
 public class OrgPathQuery {
     private String orgPath;
     private String userOrgSid;
+    private String name;
 }