Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -714,6 +714,20 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getInventoryByList(@RequestBody Map<String, Object> param) {
         return commonService.getInventoryByList(param);
     }
+
+    /**
+     * @desc   : 获取组织仓库
+     * @author : 付斌
+     * @date   : 2024-04-10 13:30
+     */
+    @ApiOperation(
+            value = "获取组织仓库",
+            notes = "获取组织仓库"
+    )
+    @PostMapping("get_org_wh")
+    public ResponseResultVO<List<Map<String, Object>>> getOrgWh(@RequestBody Map<String, Object> param) {
+        return commonService.getOrgWh(param);
+    }
 }
 
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -507,4 +507,11 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     List<Map<String, Object>> getPurviewType(Map param);
     List<Map<String, Object>> getInventoryByList(Map param);
+
+    /**
+     * @desc   : 获取组织仓库
+     * @author : 付斌
+     * @date   : 2024-04-10 13:31
+     */
+    List<Map<String, Object>> getOrgWh(Map param);
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1616,4 +1616,16 @@
         </foreach>
     </select>
 
+    <!--获取组织仓库-->
+    <select id="getOrgWh" resultType="java.util.Map">
+        select t.wh_id       as "whId",
+               tmw.wh_name   as "whName",
+               t.flg_default as "flgDefault"
+        from dkic_b.t_mst_org_wh t
+                 inner join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = t.wh_id
+        where t.cp_id = #{cpId}
+          and t.org_id = #{orgId}::uuid
+        order by t.display_no
+    </select>
+
 </mapper>

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -947,6 +947,15 @@ public class CommonService extends BaseService<Map<String, Object>> {
         // 获取供应商和客户
         List<Map<String, Object>> list = commonMapper.getPurviewType(param);
         return ResponseResultUtil.success(list);
+    }
 
+    /**
+     * @desc   : 获取组织仓库
+     * @author : 付斌
+     * @date   : 2024-04-10 13:30
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getOrgWh(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.getOrgWh(param);
+        return ResponseResultUtil.success(list);
     }
 }