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,53 @@ 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/3/9 10:08
+     */
+    @PostMapping("get_goods_for_purchase")
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsForPurchase(param);
+    }
+
+    /**
+     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @author : 常皓宁
+     * @date   : 2024/3/9 10:08
+     */
+    @PostMapping({"get_goods_for_purchase_by_page"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsForPurchaseByPage(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 +380,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 +528,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 +539,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/controller/ivt/IntoReturnItemController.java

@@ -1,8 +1,14 @@
 package com.dk.mdm.controller.ivt;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.ivt.IntoReturnItemQuery;
+import com.dk.mdm.model.response.ivt.IntoReturnItemResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,4 +27,19 @@ public class IntoReturnItemController{
     @Autowired
     private IntoReturnItemService intoReturnItemService;
 
+
+
+    /**
+     * @desc : 查询
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @ApiOperation(
+            value = "分页、关联、条件查询",
+            notes = "分页、关联、条件查询"
+    )
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<IntoReturnItemResponse>> selectByCond(@RequestBody IntoReturnItemQuery intoReturnItemQuery) {
+        return intoReturnItemService.selectByCond(intoReturnItemQuery);
+    }
 }

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

@@ -209,16 +209,44 @@ 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/3/9 10:08
+     */
+    List<Map<String, Object>> getGoodsForPurchase(Map param);
+
+    /**
+     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @author : 常皓宁
+     * @date   : 2024/3/9 10:08
+     */
+    Long getGoodsForPurchaseCountByPage(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>
 
@@ -146,6 +152,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>
     </select>
 
     <!-- 获取用户菜单-->
@@ -331,10 +343,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 +358,116 @@
         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>
+
+    <!-- 获取商品(采购) -->
+    <select id="getGoodsForPurchase" 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="getGoodsForPurchaseCountByPage" 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 +555,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">
@@ -460,10 +578,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('%',my_ex.likequery(#{supplierType}),'%')
         </if>
     </select>
 

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.java

@@ -9,7 +9,11 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 public interface InboundItemMapper extends BaseMapper<InboundItem>{
-
+    /**
+     * @desc   : 修改金额数量
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
     int  updateAmount(InboundItem inboundItem);
 	
 }

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.java

@@ -41,7 +41,11 @@ public interface InboundMapper extends BaseMapper<Inbound>{
      */
     Long selectInboundAndItemCountByCond(InboundQuery inboundQuery);
 
-
+    /**
+     * @desc   : 修改金额数量
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
     int  updateAmount(Inbound inbound);
 
     /**

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.java

@@ -2,13 +2,28 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.IntoReturnItemQuery;
+import com.dk.mdm.model.response.ivt.IntoReturnItemResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  入库退货明细 Mapper
 */
 @Repository
 public interface IntoReturnItemMapper extends BaseMapper<IntoReturnItem>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    List<IntoReturnItemResponse> selectByCond(IntoReturnItemQuery intoReturnItemQuery);
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Long countByCond(IntoReturnItemQuery intoReturnItemQuery);
 }
 

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        return_id, return_no, return_type,  pur_id, into_no, pur_no, org_id, staff_id, sup_id, contact_name, contact_phone, delivery_date, sum_quantity, sum_standard, sum_amount, sale_discount, return_status, out_status, outing_qty, outing_amt, out_qty, out_amt, amt_payable, amt_handle, amt_residue, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        return_id, return_no, return_type,  pur_id,  pur_no, org_id, staff_id, sup_id, contact_name, contact_phone, delivery_date, sum_quantity, sum_standard, sum_amount, sale_discount, return_status, out_status, outing_qty, outing_amt, out_qty, out_amt, amt_payable, amt_handle, amt_residue, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -15,7 +15,6 @@
                 <result column="return_type" property="returnType"/>
 
                 <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
-                <result column="into_no" property="intoNo"/>
                 <result column="pur_no" property="purNo"/>
                 <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
                 <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -55,7 +54,7 @@
 
 
     <sql id="Base_Column_List_Response">
-        tpir.return_id, tpir.return_no, tpir.return_type,  tpir.pur_id, tpir.into_no, tpir.pur_no, tpir.org_id,
+        tpir.return_id, tpir.return_no, tpir.return_type,  tpir.pur_id, tpir.pur_no, tpir.org_id,
         tpir.staff_id, tpir.sup_id, tpir.contact_name, tpir.contact_phone, tpir.delivery_date, tpir.sum_quantity,
         tpir.sum_standard, tpir.sum_amount, tpir.sale_discount, tpir.return_status, tpir.out_status,
         tpir.outing_qty, tpir.outing_amt, tpir.out_qty, tpir.out_amt, tpir.amt_payable, tpir.amt_handle, tpir.amt_residue,
@@ -68,7 +67,6 @@
         <result column="return_no" property="returnNo"/>
         <result column="return_type" property="returnType"/>
         <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
-        <result column="into_no" property="intoNo"/>
         <result column="pur_no" property="purNo"/>
         <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -124,9 +122,7 @@
             <if test="purId != null and purId != ''">
                 AND pur_id = #{purId}
             </if>
-            <if test="intoNo != null and intoNo != ''">
-                AND into_no = #{intoNo}
-            </if>
+
             <if test="purNo != null and purNo != ''">
                 AND pur_no = #{purNo}
             </if>
@@ -241,9 +237,7 @@
             <if test="purId != null and purId != ''">
                 AND tpir.pur_id = #{purId}
             </if>
-            <if test="intoNo != null and intoNo != ''">
-                AND tpir.into_no = #{intoNo}
-            </if>
+
             <if test="purNo != null and purNo != ''">
                 AND tpir.pur_no = #{purNo}
             </if>
@@ -329,6 +323,13 @@
                     #{item}
                 </foreach>
             </if>
+            <if  test="searchText != null">
+                AND (tpir.return_no  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  tpir.pur_no  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                 OR  tms.sup_name like concat('%', my_ex.likequery(#{searchText}) , '%')
+                 OR  tms.sup_code like concat('%', my_ex.likequery(#{searchText}) , '%')
+                 )
+            </if>
         </where>
     </sql>
 
@@ -374,6 +375,7 @@
         SELECT
         count(1)
         FROM dkic_b.t_psi_into_return tpir
+        left join  dkic_b.t_mst_supplier tms  on  tms.sup_id = tpir.sup_id
         <include refid="Condition_Response"/>
     </select>
 
@@ -410,7 +412,6 @@
             return_no,
             return_type,
             pur_id,
-            into_no,
             pur_no,
             org_id,
             staff_id,
@@ -446,7 +447,6 @@
                 #{item.returnNo},
                 #{item.returnType},
                 #{item.purId}::uuid,
-                #{item.intoNo},
                 #{item.purNo},
                 #{item.orgId}::uuid,
                 #{item.staffId}::uuid,

src/main/java/com/dk/mdm/mapper/mst/CustomerMapper.xml

@@ -215,7 +215,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM dkic_b.t_mst_customer
+        FROM dkic_b.t_mst_customer tmc
         <include refid="Condition"/>
     </select>
 

src/main/java/com/dk/mdm/mapper/mst/DictionaryDataMapper.xml

@@ -96,8 +96,12 @@
             <if test="flgDefault != null">
                 AND flg_default = #{flgDefault}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in data_value) > 0   OR position(#{searchText} in dict_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+
+            <if  test="searchText != null">
+                AND (data_value  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  dict_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
 
         </where>

src/main/java/com/dk/mdm/mapper/mst/GoodsBrandMapper.xml

@@ -74,9 +74,15 @@
             <if test="opCreateTime != null">
                 AND tmgb.op_create_time = #{opCreateTime}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in tmgb.brand_code) > 0   OR position(#{searchText} in tmgb.brand_name) > 0   OR  position(#{searchText} in tmgb.remarks) > 0 )
+
+
+            <if  test="searchText != null">
+                AND (tmgb.brand_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  tmgb.brand_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  tmgb.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
+
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/GoodsCategoryMapper.xml

@@ -108,8 +108,13 @@
                 AND tmgc.cp_id = #{cpId}
             </if>
 
-            <if test="searchText != null">
-                AND (position(#{searchText} in tmgc.cat_code) > 0   OR position(#{searchText} in tmgc.cat_name) > 0   OR  position(#{searchText} in tmgc.remarks) > 0 )
+
+
+            <if  test="searchText != null">
+                AND (tmgc.cat_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  tmgc.cat_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  tmgc.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/mst/GoodsSeriesMapper.xml

@@ -69,8 +69,13 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in series_code) > 0   OR position(#{searchText} in series_name) > 0   OR  position(#{searchText} in remarks) > 0 )
+
+
+            <if  test="searchText != null">
+                AND (series_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  series_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -102,10 +102,13 @@
             <if test="flgNolimitSen != null">
                 AND flg_nolimit_sen = #{flgNolimitSen}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in role_name) > 0   OR position(#{searchText} in role_code) > 0   OR  position(#{searchText} in remarks) > 0 )
-            </if>
 
+            <if  test="searchText != null">
+                AND (role_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  role_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.xml

@@ -84,8 +84,13 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in channel_name) > 0   OR position(#{searchText} in channel_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+
+
+            <if  test="searchText != null">
+                AND (channel_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  channel_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/mst/UnitMapper.xml

@@ -72,8 +72,12 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in unit_code) > 0   OR position(#{searchText} in unit_name) > 0   OR  position(#{searchText} in remarks) > 0 )
+
+            <if  test="searchText != null">
+                AND (unit_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  unit_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/mst/WarehouseMapper.xml

@@ -95,8 +95,12 @@
             <if test="opDbUser != null and opDbUser != ''">
                 AND op_db_user = #{opDbUser}
             </if>
-            <if test="searchText != null">
-                AND (position(#{searchText} in wh_name) > 0   OR position(#{searchText} in wh_code) > 0   OR  position(#{searchText} in remarks) > 0 )
+
+            <if  test="searchText != null">
+                AND (wh_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  wh_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
+                OR  remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
+                )
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.java

@@ -31,7 +31,11 @@ public interface PurchaseItemMapper extends BaseMapper<PurchaseItem>{
 
     int deleteById(@Param("id") String id);
     PurchaseItemResponse selectById(@Param("itemId") String id);
-
+    /**
+     * @desc   : 修改金额数量
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
     int  updateAmount(PurchaseItem purchaseItem);
 
 }

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

@@ -52,7 +52,11 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
      * @date   : 2024/2/28 9:46
      */
     Long noStoredCountByCond(PurchaseQuery purchaseQuery);
-
+    /**
+     * @desc   : 修改金额数量
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
     int updateAmount(Purchase purchase);
 
     Purchase selectPurchaseByRighting(PurchaseQuery purchaseQuery);

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

@@ -371,6 +371,7 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> intoReturnIdList;
 
+    private String searchText;
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/ivt/IntoReturnVO.java

@@ -25,16 +25,16 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- *  入库退货
+ * 入库退货
  */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Accessors(chain = true)
 @ExportTitle("入库退货")
-@TableName(value = "t_psi_into_return", autoResultMap = true,schema = "dkic_b")
-@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
-public class IntoReturnVO  implements Serializable {
+@TableName(value = "t_psi_into_return", autoResultMap = true, schema = "dkic_b")
+@ApiModel(value = "实体类：入库退货", description = "表名：t_psi_into_return")
+public class IntoReturnVO implements Serializable {
 
     /*
      * 数据库字段
@@ -377,7 +377,8 @@ public class IntoReturnVO  implements Serializable {
     @ApiModelProperty(value = "退货单id数组")
     private List<String> intoReturnIdList;
 
-
+    @ApiModelProperty(value = "自动出库办理标识")
+    private Boolean flgAutoIvt;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -401,9 +401,65 @@ 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/3/9 10:08
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getGoodsForPurchase(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc   : 获取商品（采购订单开单用）（分页）
+     * @author : 常皓宁
+     * @date   : 2024/3/9 10:08
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(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.getGoodsForPurchase(param),
+                commonMapper.getGoodsForPurchaseCountByPage(param));
+    }
+
+
+    /**
+     * @desc : 获取客户
+     * @author : 付斌
+     * @date : 2024-03-09 9:55
      */
     public ResponseResultVO<List<Map<String, Object>>> getCustomer(Map<String, Object> param) {
         // 获取系统基础数据
@@ -412,9 +468,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 +508,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);

src/main/java/com/dk/mdm/service/ivt/IntoReturnItemService.java

@@ -1,9 +1,14 @@
 package com.dk.mdm.service.ivt;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
 import com.dk.mdm.mapper.ivt.IntoReturnItemMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.IntoReturnItemQuery;
+import com.dk.mdm.model.response.ivt.IntoReturnItemResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,4 +25,16 @@ public class IntoReturnItemService extends BaseService<IntoReturnItem> {
 	@Autowired
 	private IntoReturnItemMapper intoReturnItemMapper;
 
+
+
+	/**
+	 * @desc : 查询
+	 * @author : 于继渤
+	 * @date : 2023/1/5 9:39
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<IntoReturnItemResponse>> selectByCond(IntoReturnItemQuery intoReturnItemQuery) {
+		return super.mergeListWithCount(intoReturnItemQuery, intoReturnItemMapper.selectByCond(intoReturnItemQuery), intoReturnItemMapper.countByCond(intoReturnItemQuery));
+	}
+
 }

src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -265,7 +265,14 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             intoReturnItemVO.setPriceReturn(purchaseItemResponse.getPricePur());
             //退货金额 (商品数量*退货价)
             intoReturnItemVO.setItemAmt(intoReturnItemVO.getItemQty().multiply(intoReturnItemVO.getPriceReturn()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            //自动]出库赋值  已入库数量、已入库金额
+            if (intoReturnVO.getFlgAutoIvt()) {
 
+                intoReturnItemVO.setIntoQty(intoReturnItemVO.getItemQty().abs());
+
+                intoReturnItemVO.setIntoAmt(intoReturnItemVO.getItemAmt().abs());
+
+            }
             //新建明细
             IntoReturnItem intoReturnItem = intoReturnItemConvert.convertToPo(intoReturnItemVO);
             intoReturnItemService.insert(intoReturnItem);

src/main/resources/test/bootstrap.yml

@@ -124,7 +124,7 @@ wx:
     # 证书路径
     keyPath: /mnt/cert/2021/05/11/404727f0-e5be-424e-b009-59f1ec8d102e.p12
     # 小程序支付的回调接口地址
-    wechatNotifyUrl: https://s.dev01.dkiboss.com:7000/api/mdm-server/wxapi/basic/wechat/pay/notify/order
+    wechatNotifyUrl: https://s.dev01.dkiboss.com:7000/api/mdm-server-dkic-b1/wxapi/basic/wechat/pay/notify/order
 
 
 dongke: