diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
index cea7df21a8..3738b7c2d3 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java
@@ -50,7 +50,13 @@ public class BaseGoodsBrandRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return baseBrandInfoService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseBrandInfoService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
index ad039f078c..0b224a707a 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java
@@ -51,11 +51,22 @@ public class BaseGoodsTypeRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return baseGoodsTypeService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseGoodsTypeService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
     public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
         return baseGoodsTypeService.updateIsEnable(sid,isEnable);
     }
+    @ApiOperation("更改商品是否一品一码")
+    @GetMapping("/updateIsGoodsID/{sid}/{state}")
+    public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state) {
+        return baseGoodsTypeService.updateProductCode(sid,state);
+    }
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
index fa6a121041..7df073896b 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java
@@ -51,7 +51,13 @@ public class BaseGoodsUnitRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return baseGoodsUnitService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseGoodsUnitService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
index 4ed52019da..0c2dfc1734 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java
@@ -53,7 +53,13 @@ public class BaseManufacturerRest {
         return baseManufacturerService.delete(sid);
     }
 
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseManufacturerService.delAll(sids);
+        return rb.success();
+    }
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
     public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") String isEnable) {
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java
index 906ca2eb7f..408acd3ade 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.java
@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
  */
 @Mapper
 public interface BaseBrandInfoMapper extends BaseMapper<BaseBrandInfo> {
-
+    int updateBySidIsDelete(List<String> list);
     IPage<BaseBrandInfoVo> listPage(IPage<BaseBrandInfo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseBrandInfo> qw);
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml
index 798f066dc7..e39eb2c32c 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoMapper.xml
@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE base_brand_info
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
index b550a1be61..c7bbfec8e0 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
@@ -15,9 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -36,6 +38,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("brandName",query.getName());
         }
+        qw.ne("isDelete","1");
         IPage<BaseBrandInfo> page = PagerUtil.queryToPage(pq);
         IPage<BaseBrandInfoVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<BaseBrandInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -52,7 +55,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
     }
     public ResultBean<List<BaseBrandInfo>> listAll() {
     ResultBean rb = ResultBean.fireFail();
-    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1));
+    List<BaseBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<BaseBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
     return rb.success().setData(pagging);
 }
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
@@ -114,6 +117,9 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
         }
         return rb.success().setMsg("成功");
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseBrandInfo wmsGoodsBrand = fetchBySid(sid);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
index 3be7a3a638..60e324557c 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
@@ -94,7 +94,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
             BaseGoodsSpu wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
-            wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));;
+//            wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));;
+            wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
             baseMapper.updateById(wmsGoods);
             //spu详情
             dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@@ -113,6 +114,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
             sid = wmsGoods.getSid();
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setCreateTime(new DateTime());
+            wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));
             baseMapper.insert(wmsGoods);
             //spu详情
             dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@@ -126,6 +128,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         return rb.success().setMsg("成功");
     }
 
+
     public ResultBean<BaseGoodsSpuVo> initialization(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseGoodsSpuVo vo = baseMapper.initialization(sid);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java
index 5d389be9fb..b047e66a58 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsType.java
@@ -19,4 +19,5 @@ public class BaseGoodsType extends BaseEntity {
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String outStockRule;//出库规则
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java
index 2bdf4964c8..b68f2692c6 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeDto.java
@@ -30,4 +30,6 @@ public class BaseGoodsTypeDto implements Dto {
     private String createOrgSid;//创建组织sid
     private String pName;//创建组织sid
     private String sids;//父级sid
+    private String outStockRule;//出库规则
+
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
index a71619789f..58abddd5b3 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
@@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BaseGoodsTypeMapper extends BaseMapper<BaseGoodsType> {
     IPage<BaseGoodsTypeVo> listPage(IPage<BaseGoodsType> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsType> qw);
+    int updateBySidIsDelete(List<String> list);
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml
index 11ac8aa0a8..73621a6647 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeMapper.xml
@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE base_goods_type
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java
index 3e3b90f26b..3978076b0b 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeQuery.java
@@ -9,5 +9,8 @@ import lombok.Data;
  */
 @Data
 public class BaseGoodsTypeQuery implements Query {
-    private String name;
+    private String name;//名字
+    private String code;//编码
+    private String IsGoodID;//是否一品一码（goodID），0否，1是
+    private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2）
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
index 3fb41b9b9c..0d93c2cd67 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
@@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -31,7 +33,17 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("goodsTypeName",query.getName());
         }
-
+        if(StringUtils.isNotBlank(query.getCode())){
+            qw.like("goodsTypeCode",query.getCode());
+        }
+        if(StringUtils.isNotBlank(query.getIsGoodID())){
+            qw.eq("isGoodsID",query.getIsGoodID());
+        }
+        if(StringUtils.isNotBlank(query.getOutStockRule())){
+            qw.eq("outStockRule",query.getOutStockRule());
+        }
+        qw.ne("isDelete","1");
+        qw.orderByDesc("sortNo");
         IPage<BaseGoodsType> page = PagerUtil.queryToPage(pq);
         IPage<BaseGoodsTypeVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<BaseGoodsTypeVo> p = PagerUtil.pageToVo(pagging, null);
@@ -39,14 +51,18 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         for (BaseGoodsTypeVo record : records) {
             if(StringUtils.isNotBlank(record.getPSid())){
                 BaseGoodsType wmsGoodsType1 = fetchBySid(record.getPSid());
-                record.setPName(wmsGoodsType1.getGoodsTypeName());
+                if(wmsGoodsType1!=null){
+                    record.setPName(wmsGoodsType1.getGoodsTypeName());
+                }
                 record.setSids(record.getPSid());
             }
         }
         return rb.success().setData(p);
-    }    public ResultBean<List<BaseGoodsType>> listAll() {
+    }
+    public ResultBean<List<BaseGoodsType>> listAll() {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1));
+        List<BaseGoodsType> pagging = baseMapper.selectList(new QueryWrapper<BaseGoodsType>().eq("isEnable",1)
+                .ne("isDelete","1"));
         return rb.success().setData(pagging);
     }
 
@@ -108,6 +124,9 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         }
         return rb.success();
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseGoodsType wmsGoodsType = fetchBySid(sid);
@@ -117,4 +136,13 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
         }
         return rb.success().setMsg("成功");
     }
+    public ResultBean updateProductCode(String sid,String state) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseGoodsType wmsGoodsType = fetchBySid(sid);
+        if (null != wmsGoodsType) {
+            wmsGoodsType.setIsGoodsID(state);
+            baseMapper.updateById(wmsGoodsType);
+        }
+        return rb.success().setMsg("成功");
+    }
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
index 8088922080..4414fd8080 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
@@ -34,5 +34,6 @@ public class BaseGoodsTypeVo implements Vo {
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String outStockRule;//出库规则
     private String sids;//创建组织sid
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java
index 52e3534f2b..55de9fccb0 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
@@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BaseGoodsUnitMapper extends BaseMapper<BaseGoodsUnit> {
     IPage<BaseGoodsUnitVo> listPage(IPage<BaseGoodsUnit> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsUnit> qw);
+    int updateBySidIsDelete(List<String> list);
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml
index e2e9a98925..e0deacbdd0 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitMapper.xml
@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE base_goods_unit
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
index 5abc556c4a..1606f2035d 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java
@@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -95,6 +97,10 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
         }
         return rb.success();
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseGoodsUnit wmsGoodsType = fetchBySid(sid);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java
index 5870661389..5a97b4832b 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.java
@@ -18,4 +18,5 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     IPage<BaseManufacturerVo> listPage(IPage<BaseManufacturer> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufacturer> qw);
 
     List<BaseManufacturerVo> getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid);
+    int updateBySidIsDelete(List<String> list);
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml
index 2f128ae125..416ed59e23 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerMapper.xml
@@ -17,4 +17,12 @@
         from base_manufacturer
         where useOrgSid = #{useOrgSid}
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE base_manufacturer
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
index c27e6d8469..ffdfbb3e50 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
@@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -31,7 +33,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("manufacturerName",query.getName());
         }
-
+        qw.ne("isDelete","1");
+        qw.orderByDesc("sortNo");
         IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);
         IPage<BaseManufacturerVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<BaseManufacturerVo> p = PagerUtil.pageToVo(pagging, null);
@@ -40,7 +43,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
     }
     public ResultBean<List<BaseManufacturer>> listAll() {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1));
+        List<BaseManufacturer> pagging = baseMapper.selectList(new QueryWrapper<BaseManufacturer>().eq("isEnable",1)
+                .ne("isDelete","1"));
         return rb.success().setData(pagging);
     }
 
@@ -93,6 +97,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         return rb.success();
     }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         BaseManufacturer wmsManufacturer = fetchBySid(sid);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java b/yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java
index 860c2c065c..71683413f9 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/utils/PinYinUtils.java
@@ -139,7 +139,22 @@ public class PinYinUtils {
         }
         return null;
     }
-
+    /**
+     * 缩写
+     * @param args
+     */
+    public static String sx(String hz) {
+        char [] nameArray = hz.toCharArray();
+        String b="";
+        for (int i = 0; i < nameArray.length; i++) {
+            if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) {
+                b=b+PinYinUtils.getCharDuoPinYinChar(String.valueOf(nameArray[i]));
+            }else{
+                b=b+String.valueOf(nameArray[i]);
+            }
+        }
+        return b;
+    }
     /**
      * 返回字符串的拼音的首字母
      * @param str
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
index 370c645bd9..7041ce15da 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
@@ -51,7 +51,13 @@ public class WmsWarehouseAreaRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return wmsWarehouseAreaService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        wmsWarehouseAreaService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
index e4e13d4a4b..de98aa5626 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
@@ -52,7 +52,13 @@ public class WmsWarehouseAreaTypeRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return wmsWarehouseAreaTypeService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        wmsWarehouseAreaTypeService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
index aacf482ecd..0b4f41f15a 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
@@ -53,7 +53,13 @@ public class WmsWarehouseInfoRest {
         return wmsWarehouseService.delete(sid);
     }
 
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        wmsWarehouseService.delAll(sids);
+        return rb.success();
+    }
     @ApiOperation("更改可用状态")
     @GetMapping("/updateStatus/{sid}/{state}")
     public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
index ce59b9bdba..a7ab4fb0f4 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
@@ -52,7 +52,13 @@ public class WmsWarehouseRackRest {
     public ResultBean delete(@PathVariable("sid") String sid) {
         return wmsWarehouseRackService.delete(sid);
     }
-
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        wmsWarehouseRackService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
index e8837df2ec..6198c6f340 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
@@ -18,7 +18,7 @@ import java.util.List;
 public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
     IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
     WmsWarehouseAreaVo initialization (@Param("sid") String sid);
-
+    int updateBySidIsDelete(List<String> list);
     @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
     List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
index 4cdd80de77..d9945e3c2d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
@@ -23,5 +23,12 @@
 
         where a.sid =#{sid}
     </select>
-
+    <update id="updateBySidIsDelete">
+        UPDATE wms_warehouse_area
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
index dc95bb8ee3..ad5920921a 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
@@ -9,5 +9,8 @@ import lombok.Data;
  */
 @Data
 public class WmsWarehouseAreaQuery implements Query {
-    private String name;
+    private String name;//名字
+    private String code;//编码
+    private String warehouseSid;//仓库
+    private String areaTypeSid;//库区类型
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
index d357cde69d..7dcc7b1afb 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
@@ -12,8 +12,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -30,7 +32,16 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("areaName",query.getName());
         }
-
+        if(StringUtils.isNotBlank(query.getCode())){
+            qw.like("areaCode",query.getCode());
+        }
+        if(StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("b.sid",query.getWarehouseSid());
+        }
+        if(StringUtils.isNotBlank(query.getAreaTypeSid())){
+            qw.eq("c.sid",query.getAreaTypeSid());
+        }
+        qw.ne("a.isDelete","1");
         IPage<WmsWarehouseArea> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WmsWarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
@@ -39,7 +50,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
     }
     public ResultBean<WmsWarehouseAreaVo> getAllType() {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1));
+        List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1)
+                .ne("isDelete","1"));
         return rb.success().setData(pagging);
     }
 
@@ -77,6 +89,11 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         }
         return rb.success();
     }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
index dff49768f8..d429b6448c 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Param;
 public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaType> {
     IPage<WmsWarehouseAreaTypeVo> listPage(IPage<WmsWarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseAreaType> qw);
     WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
+    int updateBySidIsDelete(List<String> list);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
index c9a6c7995f..d8745906a2 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
@@ -18,5 +18,12 @@
         from wms_warehouse_area_type a
         where a.sid =#{sid}
     </select>
-
+    <update id="updateBySidIsDelete">
+        UPDATE wms_warehouse_area_type
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
index f8f4d52bf6..9e0fe8c749 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
@@ -12,8 +12,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -28,9 +30,9 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
         WmsWarehouseAreaTypeQuery query = pq.getParams();
         QueryWrapper<WmsWarehouseAreaType> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
-            qw.like("areaName",query.getName());
+            qw.like("warehouseAreaTypeName",query.getName());
         }
-
+        qw.ne("isDelete","1");
         IPage<WmsWarehouseAreaType> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WmsWarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
@@ -39,7 +41,8 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
     }
     public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1));
+        List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
+                .ne("isDelete","1"));
         return rb.success().setData(pagging);
     }
 
@@ -77,6 +80,9 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
         }
         return rb.success();
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
index 0f164290bf..8e1f521c89 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
@@ -24,18 +24,7 @@ public class WmsWarehouseInfo extends BaseEntity {
     private String warehouseTypeValue;//仓库类型value
     private String usageStatus;//使用状态,0停用 1正常
     private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
+    private String sortNo;//排序
     private String useOrgSid;//创建组织sid
     private String createOrgSid;//创建组织sid
-
-
-
-
-
-
-
-
-
-
-
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
index f702273f52..52498fc2e9 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
@@ -8,6 +8,7 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -19,6 +20,7 @@ import java.util.List;
 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();
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
index 69e01fe07d..25dc91b176 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
@@ -12,4 +12,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE wms_warehouse_info
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
index eb0b237654..0096dfb491 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class WmsWarehouseInfoQuery implements Query {
     private String name;
+    private String code;
+    private String address;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
index 45b12c5079..cd1932c11b 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
@@ -19,8 +19,10 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -39,7 +41,14 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("warehouseName",query.getName());
         }
-
+        if(StringUtils.isNotBlank(query.getCode())){
+            qw.like("warehouseCode",query.getCode());
+        }
+        if(StringUtils.isNotBlank(query.getAddress())){
+            qw.like("address",query.getAddress());
+        }
+        qw.ne("isDelete",1);
+        qw.orderByDesc("sortNo");
         IPage<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WmsWarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -114,6 +123,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         }
         return rb.success();
     }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
index 2755312d82..65407e0c42 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
@@ -8,6 +8,8 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
@@ -16,4 +18,5 @@ import org.apache.ibatis.annotations.Param;
 public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
     IPage<WmsWarehouseRackVo> listPage(IPage<WmsWarehouseRack> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseRack> qw);
     WmsWarehouseRackVo initialization (@Param("sid") String sid);
+    int updateBySidIsDelete(List<String> list);
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
index 13f5fbdd00..64fa0a6c9d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
@@ -22,4 +22,13 @@
                  left join wms_warehouse_info c on c.sid = a.warehouseSid
         where a.sid =#{sid}
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE wms_warehouse_rack
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
index 4ee91bcea1..fe8876638d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
@@ -9,5 +9,8 @@ import lombok.Data;
  */
 @Data
 public class WmsWarehouseRackQuery implements Query {
-    private String name;
+    private String name;//名字
+    private String code;//编码
+    private String warehouseSid;//仓库
+    private String areaTypeSid;//库区类型
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
index 608cdd68cd..770fe6757f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
@@ -13,8 +13,10 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -31,7 +33,16 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("rackName",query.getName());
         }
-
+        if(StringUtils.isNotBlank(query.getCode())){
+            qw.like("rackCode",query.getCode());
+        }
+        if(StringUtils.isNotBlank(query.getAreaTypeSid())){
+            qw.eq("b.sid",query.getAreaTypeSid());
+        }
+        if(StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("c.sid",query.getWarehouseSid());
+        }
+        qw.ne("a.isDelete","1");
         IPage<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WmsWarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
@@ -40,7 +51,8 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
     }
     public ResultBean<WmsWarehouseRackVo> getAllType() {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1));
+        List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1)
+                .ne("isDelete","1"));
         return rb.success().setData(pagging);
     }
 
@@ -78,6 +90,10 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         }
         return rb.success();
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid);