获取仓库添加新接口

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/AppScmWarehouseVo.java

@@ -13,4 +13,6 @@ public class AppScmWarehouseVo implements Vo {
     private String dictKey;
     @ApiModelProperty("仓库value")
     private String dictValue;
+
+    private
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.scm.api.scmwarehouse;
+
+import lombok.Data;
+
+/**
+ * @description: 说明
+ * @author: dimengzhe
+ * @date: 2023/5/24
+ **/
+@Data
+public class ScmExtra {
+
+    private String name;
+    private String sid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmwarehouse;
+
+import lombok.Data;
+
+/**
+ * @description: 仓库相关
+ * @author: dimengzhe
+ * @date: 2023/5/24
+ **/
+@Data
+public class ScmWarVo {
+
+    private String id;
+    private String dictValue;
+    private ScmExtra extra;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@@ -73,6 +73,10 @@ public interface ScmWarehouseFeign {
     @GetMapping(value = "/selectWarehouseByUserSid")
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@SpringQueryMap AppScmWarehouseQuery appScmWarehouseQuery);
 
+    @ApiOperation("手机端-获取仓库新")
+    @GetMapping(value = "/selectWarehouseByUserSidOne")
+    public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath,@RequestParam(value = "search",required = false) String search);
+
     @ApiOperation("巡检获取仓库管理人")
     @GetMapping("/selectByAddressSid/{addressSid}")
     public ResultBean<ScmWarehouseVo> selectByAddressSid(@PathVariable("addressSid") String addressSid);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@@ -79,6 +79,11 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
+        return null;
+    }
+
     @Override
     public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
         return null;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java

@@ -26,16 +26,16 @@
 package com.yxt.anrui.scm.biz.scmwarehouse;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmwarehouse.AppScmWarehouseVo;
-import com.yxt.common.core.result.ResultBean;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
-import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 
 import java.util.List;
 import java.util.Map;
@@ -69,6 +69,7 @@ public interface ScmWarehouseMapper extends BaseMapper<ScmWarehouse> {
     List<Map<String, String>> fetchByUseOrgSid(String sid);
 
     List<AppScmWarehouseVo> selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid);
+    List<ScmWarVo> selectWarehouseByUserSidOne(@Param("useOrgSid") String useOrgSid,@Param("search") String search);
 
     @Select("select * from scm_warehouse where sid =#{addressSid}")
     ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml

@@ -27,4 +27,15 @@
         FROM scm_warehouse
         WHERE useOrgSid = #{useOrgSid}
     </select>
+
+    <select id="selectWarehouseByUserSidOne" resultType="com.yxt.anrui.scm.api.scmwarehouse.ScmWarVo">
+        SELECT sid,
+        sid           as id,
+        warehouseName as dictValue
+        FROM scm_warehouse
+        WHERE useOrgSid = #{useOrgSid}
+        <if test="search != null and search != ''">
+            AND warehouseName LIKE concat('%', #{search}, '%')
+        </if>
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@@ -117,6 +117,11 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
         return scmWarehouseService.selectWarehouseByUserSid(appScmWarehouseQuery);
     }
 
+    @Override
+    public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
+        return scmWarehouseService.selectWarehouseByUserSidOne(userSid,orgPath,search);
+    }
+
     @Override
     public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
         return scmWarehouseService.selectByAddressSid(addressSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -22,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -203,4 +202,26 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
     public ScmWarehouseVo selectByGressionCode(String useOrgSid) {
         return baseMapper.selectByGressionCode(useOrgSid);
     }
+
+    public ResultBean<List<ScmWarVo>> selectWarehouseByUserSidOne(String userSid, String orgPath, String search) {
+        ResultBean<List<ScmWarVo>> rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        } else {
+            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }
+        List<ScmWarVo> list = baseMapper.selectWarehouseByUserSidOne(orgPath,search);
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            for (int i = 0; i < list.size(); i++) {
+                ScmWarVo scmWarVo = list.get(i);
+                ScmExtra scmExtra = new ScmExtra();
+                scmExtra.setSid(scmWarVo.getId());
+                scmExtra.setName(scmWarVo.getDictValue());
+                scmWarVo.setExtra(scmExtra);
+            }
+        }
+
+        return rb.success().setData(list);
+    }
 }