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

@@ -1236,8 +1236,6 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
 
-
-
     /**
      * @desc : 获取仓位
      * @author : 洪旭东
@@ -1482,6 +1480,21 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getWarehouseByPage(@RequestBody Map<String, Object> param) {
         return commonService.getWarehouseByPage(param);
     }
+
+
+    /**
+     * @desc   : 获取仓库
+     * @author : 常皓宁
+     * @date   : 2024/3/4 10:49
+     */
+    @ApiOperation(
+            value = "获取仓库",
+            notes = "获取仓库"
+    )
+    @PostMapping("get_warehouse")
+    public ResponseResultVO<List<Map<String, Object>>> getWarehouse(@RequestBody Map<String, Object> param) {
+        return commonService.getWarehouse(param);
+    }
 }
 
 

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

@@ -827,9 +827,6 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     List<Map<String, String>> getWsPrinter(Map param);
 
 
-
-
-
     /**
      * @desc   : 获取仓位
      * @author : 洪旭东
@@ -1040,4 +1037,12 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date   : 2024/3/1 9:21
      */
     Long countWarehouseByPage(Map param);
+
+
+    /**
+     * @desc   : 获取仓库
+     * @author : 常皓宁
+     * @date   : 2024/3/4 10:50
+     */
+    List<Map<String, Object>> getWarehouse(Map param);
 }

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

@@ -2577,6 +2577,55 @@
           and ptwp.flg_valid
     </select>
 
+    <!-- 获取仓库 -->
+    <select id="getWarehouse" resultType="java.util.Map">
+        SELECT tmw.wh_id as "whId"
+                ,tmw.wh_name as "whName"
+                ,tmw.wh_code as "whCode"
+        FROM dkic_b.t_mst_warehouse tmw
+        WHERE tmw.cp_id = #{cpId}
+        and tmw.flg_valid
+        <if test="whCode!=null and whCode!=''">
+            and position(#{whCode} in tmw.wh_code) > 0
+        </if>
+        <if test="whName!=null and whName!=''">
+            and position(#{whName} in tmw.wh_name) > 0
+        </if>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!--获取仓库-->
+    <select id="getWarehouseByPage" resultType="java.util.Map">
+        SELECT mtw.wh_id as "whId",sys.f_code_name(mtw.wh_code,mtw.wh_name) AS "whCodeName"
+        FROM mst.t_warehouse mtw left join core.t_user ctu on ctu.user_id = mtw.op_create_user_id
+        WHERE mtw.fty_id = #{ftyId}
+        and mtw.flg_valid
+        <if test="whCode!=null and whCode!=''">
+            and position(#{whCode} in mtw.wh_code) > 0
+        </if>
+        <if test="whName!=null and whName!=''">
+            and position(#{warehouseName} in mtw.wh_name) > 0
+        </if>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!--获取仓库个数-->
+    <select id="countWarehouseByPage" resultType="Long">
+        select count(1)
+        from mst.t_warehouse mtw
+        WHERE mtw.fty_id = #{ftyId}
+        and mtw.flg_valid
+        <if test="whCode!=null and whCode!=''">
+            and position(#{whCode} in mtw.wh_code) > 0
+        </if>
+        <if test="whName!=null and whName!=''">
+            and position(#{warehouseName} in mtw.wh_name) > 0
+        </if>
+    </select>
 
     <!--获取仓位-->
     <select id="getWarehousePlaceByPage" resultType="java.util.Map">
@@ -2942,7 +2991,7 @@
         FROM dkic_b.t_mst_goods_brand tmgb
         <where>
             <if test="searchText !=null">
-                AND ( tmgb.brand_name LIKE concat('%', #{searchText}, '%')
+                AND   tmgb.brand_name LIKE concat('%', #{searchText}, '%')
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -2963,7 +3012,7 @@
         FROM dkic_b.t_mst_goods_brand tmgb
         <where>
             <if test="searchText !=null">
-                AND ( tmgb.brand_name LIKE concat('%', #{searchText}, '%')
+                AND  tmgb.brand_name LIKE concat('%', #{searchText}, '%')
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -2972,14 +3021,16 @@
     </select>
     <select id="getGoodsCategory" resultType="java.util.Map">
         SELECT
+        cat_id AS "catId",
         cat_code AS "catCode",
         cat_name AS "catName",
+        parent_id AS "parentId",
         flg_valid AS "flgValid"
         FROM dkic_b.t_mst_goods_category
         <where>
             <if test="searchText !=null">
                 AND ( cat_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -2998,7 +3049,7 @@
         <where>
             <if test="searchText !=null">
                 AND ( cat_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3007,14 +3058,15 @@
     </select>
     <select id="getGoodsSeries" resultType="java.util.Map">
         SELECT
-        series_code AS "catCode",
-        series_name AS "catName",
+        series_id AS "seriesId",
+        series_code AS "seriesCode",
+        series_name AS "serieName",
         flg_valid AS "flgValid"
         FROM dkic_b.t_mst_goods_series
         <where>
             <if test="searchText !=null">
                 AND ( series_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3032,7 +3084,7 @@
         <where>
             <if test="searchText !=null">
                 AND ( series_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3041,14 +3093,16 @@
     </select>
     <select id="getUnit" resultType="java.util.Map">
         SELECT
+        unit_id AS "unitId",
         unit_code AS "unitCode",
         unit_name AS "unitName",
+        decimal_places AS "decimalPlaces",
         flg_valid AS "flgValid"
         FROM  dkic_b.t_mst_unit
         <where>
             <if test="searchText !=null">
                 AND ( unit_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3066,7 +3120,7 @@
         <where>
             <if test="searchText !=null">
                 AND ( unit_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or   remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3077,6 +3131,7 @@
     <!--获取仓库档案-->
     <select id="getWarehouseByPage" resultType="java.util.Map">
         SELECT
+        wh_id AS "whId",
         wh_code AS "whCode",
         wh_name AS "whName",
         supervisor AS "supervisor",
@@ -3086,7 +3141,7 @@
         <where>
             <if test="searchText !=null">
                 AND ( wh_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or  remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}
@@ -3106,7 +3161,7 @@
         <where>
             <if test="searchText !=null">
                 AND ( wh_name LIKE concat('%', #{searchText}, '%')
-                or ( remarks LIKE concat('%', #{searchText}, '%')
+                or  remarks LIKE concat('%', #{searchText}, '%'))
             </if>
             <if test="cpId != null">
                 AND cp_id = #{cpId}

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -50,7 +50,8 @@
         tpp.op_update_user_id,
         tpp.op_app_code,
         tpp.op_timestamp,
-        tpp.op_db_user
+        tpp.op_db_user,
+        tpp.wh_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -267,7 +268,7 @@
                 AND tpp.staff_id = #{staffId}
             </if>
             <if test="supId != null and supId != ''">
-                AND tpp.sup_id = #{supId}
+                AND tpp.sup_id = #{supId}::uuid
             </if>
             <if test="contactName != null and contactName != ''">
                 AND tpp.contact_name = #{contactName}
@@ -362,6 +363,25 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND tpp.op_db_user = #{opDbUser}
             </if>
+            <if test="intoStatusList != null  and intoStatusList.size()>0">
+                AND tpp.into_status =
+                any(#{intoStatusList,typeHandler=StringListTypeHandler})
+            </if>
+            <if test="skuName != null and skuName!='' ">
+                and exists (select 1 from dkic_b.t_psi_purchase_item tppi
+                left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tppi.sku_id
+                where
+                tpp.pur_id = tppi.pur_id
+                and tppi.flg_valid
+                AND position(#{skuName} in tmgs.sku_name) > 0
+                )
+            </if>
+            <if test="pickupDateStart != null">
+                AND tpp.pickup_date &gt;= #{pickupDateStart}::timestamp with time zone
+            </if>
+            <if test="pickupDateEnd != null">
+                AND tpp.pickup_date &lt; #{pickupDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
         </where>
     </sql>
 
@@ -381,11 +401,13 @@
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
         ,tmp.sup_name as "supplierName"
+        ,tmw.wh_name as "whName"
         FROM dkic_b.t_psi_purchase tpp
         Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
         Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
         Left join dkic_b.t_mst_staff tms on tpp.staff_id = tms.staff_id
         Left join dkic_b.t_mst_staff tms1 on tpp.make_staff = tms1.staff_id
+        Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
         <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -401,11 +423,13 @@
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
         ,tmp.sup_name as "supplierName"
+        ,tmw.wh_name as "whName"
         FROM dkic_b.t_psi_purchase tpp
         Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
         Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
         Left join dkic_b.t_mst_staff tms on tpp.staff_id = tms.staff_id
         Left join dkic_b.t_mst_staff tms1 on tpp.make_staff = tms1.staff_id
+        Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
         WHERE pur_id = #{purId}::uuid
     </select>
 

src/main/java/com/dk/mdm/model/query/pur/PurchaseQuery.java

@@ -24,6 +24,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  采购订单
@@ -363,6 +364,21 @@ public class PurchaseQuery extends PageInfo<PurchaseQuery> implements Serializab
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    @ApiModelProperty(value = "入库状态")
+    private List<String> intoStatusList;
+
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+    @ApiModelProperty(value = "取货日期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class,exist = false)
+    private LocalDate pickupDateStart;
+
+    @ApiModelProperty(value = "取货日期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class,exist = false)
+    private LocalDate  pickupDateEnd;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/pur/PurchaseResponse.java

@@ -393,6 +393,12 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "供应商名称")
     private String supplierName;
 
+    /**
+     * 收货仓库
+     */
+    @ApiModelProperty(value = "收货仓库")
+    private String whName;
+
 
     @ApiModelProperty(value = "采购订单明细")
     private List<PurchaseItemResponse> purchaseItemResponseList;

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

@@ -1216,8 +1216,6 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
 
-
-
     /**
      * @desc : 获取仓位
      * @author : 洪旭东
@@ -1490,4 +1488,15 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getWarehouseByPage(param),
                 commonMapper.countWarehouseByPage(param));
     }
+
+    /**
+     * @desc   : 获取仓库
+     * @author : 常皓宁
+     * @date   : 2024/3/4 10:50
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getWarehouse(Map<String, Object> param) {
+        // 获取仓库
+        List<Map<String, Object>> list = commonMapper.getWarehouse(param);
+        return ResponseResultUtil.success(list);
+    }
 }