Merge remote-tracking branch 'origin/master'

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

@@ -299,7 +299,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getDoc(@RequestBody Map<String, Object> param) {
         return commonService.getDoc(param);
     }
-    
+
     /**
      * @desc : 获取商品
      * @author : 姜宁
@@ -326,13 +326,33 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取商品
-     * @author : 姜宁
-     * @date : 2023/1/9 13:50
+     * @desc : 获取商品（销售订单开单用）
+     * @author : 付斌
+     * @date : 2024-03-09 9:54
+     */
+    @PostMapping("get_goods_for_order")
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsForOrder(param);
+    }
+
+    /**
+     * @desc : 获取商品（销售订单开单用）（分页）
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
+     */
+    @PostMapping({"get_goods_for_order_by_page"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsForOrderByPage(param);
+    }
+
+    /**
+     * @desc : 获取客户
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     @ApiOperation(
-            value = "获取商品",
-            notes = "获取商品"
+            value = "获取客户",
+            notes = "获取客户"
     )
     @PostMapping("get_customer")
     public ResponseResultVO<List<Map<String, Object>>> getCustomer(@RequestBody Map<String, Object> param) {
@@ -340,11 +360,11 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取商品（分页）
-     * @author : 姜宁
-     * @date : 2023/1/29 16:52
+     * @desc : 获取客户（分页）
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
-    @ApiOperation(value = "获取商品分页查询", notes = "获取商品分页查询")
+    @ApiOperation(value = "获取客户分页查询", notes = "获取客户分页查询")
     @PostMapping({"get_customer_by_page"})
     public ResponseResultVO<PageList<Map<String, Object>>> GetCustomerByPage(@RequestBody Map<String, Object> param) {
         return commonService.GetCustomerByPage(param);
@@ -488,9 +508,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 供应商类别
+     * @desc : 供应商类别
      * @author : 宋扬
-     * @date   : 2024/3/6 10:28
+     * @date : 2024/3/6 10:28
      */
     @ApiOperation(value = "获取供应商类别", notes = "获取供应商类别")
     @PostMapping({"get_supType"})
@@ -499,9 +519,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 供应商服务类别
+     * @desc : 供应商服务类别
      * @author : 宋扬
-     * @date   : 2024/3/6 10:29
+     * @date : 2024/3/6 10:29
      */
     @ApiOperation(value = "获取供应商服务类别", notes = "获取供应商服务类别")
     @PostMapping({"get_serviceCategories"})

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

@@ -209,16 +209,30 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getGoodsCountByPage(Map param);
 
     /**
-     * @desc : 获取商品
-     * @author : 姜宁
-     * @date : 2023/1/9 13:49
+     * @desc   : 获取商品（销售订单开单用）
+     * @author : 付斌
+     * @date   : 2024-03-09 9:57
+     */
+    List<Map<String, Object>> getGoodsForOrder(Map param);
+
+    /**
+     * @desc   : 获取商品（销售订单开单用）(数量)
+     * @author : 付斌
+     * @date   : 2024-03-09 9:57
+     */
+    Long getGoodsForOrderCountByPage(Map param);
+
+    /**
+     * @desc : 获取客户
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     List<Map<String, Object>> getCustomer(Map param);
 
     /**
-     * @desc : 获取商品（数量）
-     * @author : 姜宁
-     * @date : 2023/1/29 17:04
+     * @desc : 获取客户(数量)
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     Long getCustomerCountByPage(Map param);
 

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

@@ -130,6 +130,12 @@
         <if test="orgId != null">
             AND org_id != #{orgId}
         </if>
+        <if test="orgCode != null">
+            AND org_code LIKE concat('%',my_ex.likequery(#{orgCode}),'%')
+        </if>
+        <if test="orgName != null">
+            AND org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
         order by display_no
     </select>
 
@@ -331,10 +337,10 @@
         where tmgs.flg_valid
           AND tmgs.cp_id = #{cpId}
         <if test="skuCode != null">
-            AND tmgs.sku_code = #{skuCode}
+            AND tmgs.sku_code LIKE concat('%',my_ex.likequery(#{skuCode}),'%')
         </if>
         <if test="skuName != null">
-            AND tmgs.sku_name = #{skuName}
+            AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
     </select>
 
@@ -346,10 +352,63 @@
         where tmgs.flg_valid
           AND tmgs.cp_id = #{cpId}
         <if test="skuCode != null">
-            AND tmgs.sku_code = #{skuCode}
+            AND tmgs.sku_code LIKE concat('%',my_ex.likequery(#{skuCode}),'%')
         </if>
         <if test="skuName != null">
-            AND tmgs.sku_name = #{skuName}
+            AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
+        </if>
+    </select>
+
+    <!-- 获取商品 -->
+    <select id="getGoodsForOrder" resultType="java.util.Map">
+        select tmgs.sku_id            as "skuId",
+               tmgs.sku_code          as "skuCode",
+               tmgs.sku_name          as "skuName",
+               tmgs.sku_model         as "skuModel",
+               tmgs.brand_id          as "brandId",
+               tmgb.brand_name        as "brandName",
+               tmgs.category_id       as "categoryId",
+               tmgc.cat_name          as "categoryName",
+               tmgs.unit_id           as "unitId",
+               tmgu.unit_name         as "unitName",
+               tmgs.sub_unit_id       as "subUnitId",
+               tmgs.conversion_factor as "conversionFactor",
+               tmgs.series_id         as "seriesId",
+               tmgseries.series_name  as "seriesName",
+               tmgs.sku_spec          as "skuSpec",
+               tmgs.price_purchase    as "pricePurchase",
+               tmgs.price_standard    as "priceStandard",
+               tmgs.price_wholesale   as "priceWholesale",
+               tmgs.price_limited     as "priceLimited",
+               tmgs.sku_images        as "skuImages",
+               tmgs.remarks
+        from dkic_b.t_mst_goods_sku as tmgs
+                 left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
+                 left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
+                 left join dkic_b.t_mst_goods_series as tmgseries on tmgs.series_id = tmgseries.series_id
+                 left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+        where tmgs.flg_valid
+          AND tmgs.cp_id = #{cpId}
+        <if test="skuCode != null">
+            AND tmgs.sku_code LIKE concat('%',my_ex.likequery(#{skuCode}),'%')
+        </if>
+        <if test="skuName != null">
+            AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
+        </if>
+    </select>
+
+    <!-- 获取商品个数 -->
+    <select id="getGoodsForOrderCountByPage" resultType="Long">
+        SELECT
+        count(1)
+        from dkic_b.t_mst_goods_sku as tmgs
+        where tmgs.flg_valid
+          AND tmgs.cp_id = #{cpId}
+        <if test="skuCode != null">
+            AND tmgs.sku_code LIKE concat('%',my_ex.likequery(#{skuCode}),'%')
+        </if>
+        <if test="skuName != null">
+            AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
     </select>
 
@@ -437,13 +496,13 @@
         from dkic_b.t_mst_supplier tms
         where tms.cp_id = #{cpId}
         <if test="supplierName!=null and supplierName!=''">
-            AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
+            AND tms.sup_name LIKE concat('%',my_ex.likequery(#{supplierName}),'%')
         </if>
         <if test="supplierCode!=null and supplierCode!=''">
-            AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
+            AND tms.sup_code LIKE concat('%',my_ex.likequery(#{supplierCode}),'%')
         </if>
         <if test="supplierType!=null and supplierType!=''">
-            AND tms.sup_type LIKE concat('%', #{supplierType}, '%')
+            AND tms.sup_type LIKE concat('%',my_ex.likequery(#{supplierType}),'%')
         </if>
         order by tms.sup_code
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -143,9 +143,6 @@
             <if test="payableId != null and payableId != ''">
                 AND t.payable_id = #{payableId}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -175,6 +172,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -223,8 +223,8 @@
                t.make_time,
                t.receivable_id,
                t.payable_id,
-               t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM t_psi_outbound as t
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -201,9 +201,6 @@
             <if test="makeTime != null">
                 AND t.make_time = #{makeTime}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -230,6 +227,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -288,7 +288,8 @@
                t.annex_paths,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM dkic_b.t_psi_order as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/mapper/sale/OutReturnMapper.xml

@@ -198,9 +198,6 @@
             <if test="makeStaff != null and makeStaff != ''">
                 AND t.make_staff = #{makeStaff}
             </if>
-            <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
-            </if>
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
@@ -224,6 +221,9 @@
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
                 AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
         </where>
     </sql>
 
@@ -282,8 +282,8 @@
                t.make_staff,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               t.flg_valid
         FROM t_psi_out_return as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/model/query/ivt/OutboundQuery.java

@@ -352,6 +352,10 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate outDateEnd;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -438,7 +438,9 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate deliveryDateEnd;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/sale/OutReturnQuery.java

@@ -434,6 +434,10 @@ public class OutReturnQuery extends PageInfo<OutReturnQuery> implements Serializ
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate pickupDateEnd;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -401,9 +401,36 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取商品
-     * @author : 姜宁
-     * @date : 2023/1/9 13:50
+     * @desc   : 获取商品（销售订单开单用）
+     * @author : 付斌
+     * @date   : 2024-03-09 9:57
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getGoodsForOrder(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc   : 获取商品（销售订单开单用）（分页）
+     * @author : 付斌
+     * @date   : 2024-03-09 9:57
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+        // 分页参数赋值
+        param = this.getLimit(param);
+        return super.mergeListWithCount(param, commonMapper.getGoodsForOrder(param),
+                commonMapper.getGoodsForOrderCountByPage(param));
+    }
+
+    /**
+     * @desc : 获取客户
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     public ResponseResultVO<List<Map<String, Object>>> getCustomer(Map<String, Object> param) {
         // 获取系统基础数据
@@ -412,9 +439,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取商品数量
-     * @author : 姜宁
-     * @date : 2023/1/29 17:01
+     * @desc : 获取客户（分页）
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     public ResponseResultVO<PageList<Map<String, Object>>> GetCustomerByPage(Map<String, Object> param) {
         // 校验分页参数
@@ -452,7 +479,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         param = this.getLimit(param);
         // 定义返回值
         PageList data = new PageList<>();
-        // 获取公司
+        // 获取供应商
         List<Map<String, Object>> list = commonMapper.getSupplier(param);
         // 获取总数量
         Long total = commonMapper.countSupplier(param);