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

@@ -1400,9 +1400,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取供应商
+     * @desc : 获取供应商
      * @author : 常皓宁
-     * @date   : 2024/3/1 9:19
+     * @date : 2024/3/1 9:19
      */
     @ApiOperation(
             value = "获取供应商",
@@ -1414,9 +1414,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取供应商分页
+     * @desc : 获取供应商分页
      * @author : 常皓宁
-     * @date   : 2024/3/1 9:19
+     * @date : 2024/3/1 9:19
      */
     @ApiOperation(
             value = "获取供应商（分页）",
@@ -1426,6 +1426,17 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getSupplierByPage(@RequestBody Map<String, Object> param) {
         return commonService.getSupplierByPage(param);
     }
+
+    /**
+     * @desc : 获取渠道
+     * @author : 付斌
+     * @date : 2024-03-02 10:18
+     */
+    @ApiOperation(value = "获取渠道", notes = "获取渠道")
+    @PostMapping({"get_channel"})
+    public ResponseResultVO<List<Map<String, Object>>> getChannel(@RequestBody Map<String, Object> param) {
+        return commonService.getChannel(param);
+    }
 }
 
 

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

@@ -973,4 +973,11 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date   : 2024/3/1 9:21
      */
     Long countSupplier(Map<String, Object> param);
+
+    /**
+     * @desc   : 获取渠道
+     * @author : 付斌
+     * @date   : 2024-03-02 10:18
+     */
+    List<Map<String, Object>> getChannel(Map param);
 }

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

@@ -20,13 +20,15 @@
     </select>
 
     <!--获取编码-->
-    <select id="getUniqueCode"  resultType="java.util.Map">
-        select out_id AS "outId",out_code AS "outNote" from dkic_b.f_create_code_id(#{cpId},#{docName});
+    <select id="getUniqueCode" resultType="java.util.Map">
+        select out_id AS "outId", out_code AS "outNote"
+        from dkic_b.f_create_code_id(#{cpId}, #{docName});
     </select>
 
     <!--获取单号-->
-    <select id="getUniqueNote"  resultType="java.util.Map">
-        select out_id AS "outId",out_note AS "outNote" from dkic_b.f_create_note_id(#{cpId},#{docName});
+    <select id="getUniqueNote" resultType="java.util.Map">
+        select out_id AS "outId", out_note AS "outNote"
+        from dkic_b.f_create_note_id(#{cpId}, #{docName});
     </select>
 
     <resultMap id="BaseResultMap" type="java.util.Map">
@@ -628,7 +630,7 @@
         select sku_id   as "skuId",
                sku_code as "skuCode",
                sku_name as "skuName",
-               remarks     as "remarks"
+               remarks  as "remarks"
         from mst.t_erp_sku
         where flg_valid
           and fty_id = #{ftyId}
@@ -681,16 +683,16 @@
 
     <!-- 获取数据字典 -->
     <select id="getDictionaryData" resultType="java.util.Map">
-        select tdd.data_id AS "dataId",
-        tdd.data_value as "dataValue",
-        tdd.dict_code AS "dictCode"
-        from core.t_dictionary_data as tdd
-        where tdd.flg_valid
-        and (tdd.fty_id = #{ftyId} OR tdd.fty_id = 0)
-        <if test="dictCode != null and dictCode != ''">
-            and tdd.dict_code = #{dictCode}
-        </if>
-        order by tdd.display_no
+        select dd.data_id     as "dataId",
+               dd.dict_code   as "dictCode",
+               dd.data_code   as "dataCode",
+               dd.data_value  as "dataValue",
+               dd.flg_default as "flgDefault"
+        from dkic_b.t_mst_dictionary_data as dd
+        where dd.flg_valid
+          and dd.cp_id = #{cpId}
+          and dd.dict_code = #{dictCode}
+        order by dd.display_no
     </select>
 
     <!-- 获取数据类型 -->
@@ -1208,17 +1210,18 @@
 
     <!-- 查询损坯原因/产品缺陷/开模损原因-->
     <select id="getProductDefect" resultMap="getProductDefectMap">
-        select tpd.defect_id                                    AS "defectId",
-               tpd.defect_name                                  AS "defectName",
-               tpd.defect_code                                  AS "defectCode",
-               sys.f_code_name(tpd.defect_code,tpd.defect_name) AS "codeName",
-               tpd.defect_types                                 as "defectTypes",
+        select tpd.defect_id                                     AS "defectId",
+               tpd.defect_name                                   AS "defectName",
+               tpd.defect_code                                   AS "defectCode",
+               sys.f_code_name(tpd.defect_code, tpd.defect_name) AS "codeName",
+               tpd.defect_types                                  as "defectTypes",
                (
                    select json_agg(jsonb_build_object('fineId', fine_id, 'fineName', fine_name,
-                                                      'deductNum', deduct_num,'fineCodeName',sys.f_code_name(fine_code,fine_name)))
+                                                      'deductNum', deduct_num, 'fineCodeName',
+                                                      sys.f_code_name(fine_code, fine_name)))
                    from mst.t_product_defect_fine
-                   where fine_id = any(tpd.defect_fines)
-               ) as "defectFines"
+                   where fine_id = any (tpd.defect_fines)
+               )                                                 as "defectFines"
         from mst.t_product_defect tpd
         where tpd.fty_id = #{ftyId}
           and tpd.flg_valid
@@ -2119,7 +2122,7 @@
         select appm.menu_uuid                                         AS "menuUuid"
              , appm.menu_name                                         as name
              , sys.f_get_name_i18n_lang(appm.menu_name_i18n, #{i18n}) as "menuName"
-             , appm.fun_uuid                                            AS "funUuid"
+             , appm.fun_uuid                                          AS "funUuid"
              , appm.object_code                                       AS "objectCode"
              , appm.menu_type                                         AS "menuType"
         from sys.t_app_menu appm
@@ -2200,13 +2203,15 @@
         SELECT kind_code as "kindCode", sys.f_get_name_i18n_lang(kind_name_i18n, #{i18n}) as "kindName"
         FROM sys.t_data_kind t
         where t.kind_type = '型号种类'
-          and t.kind_tags -> 'used' ?? '标签' and flg_valid
+          and t.kind_tags - > 'used' ?? '标签' and flg_valid
         order by t.display_no
     </select>
 
     <select id="getModelProductLabelType" resultType="java.util.Map">
-        SELECT kind_code as "kindCode", sys.f_get_name_i18n_lang(kind_name_i18n,#{i18n}) as "kindName"
-        from sys.t_data_kind t where t.kind_type='验证标签' and (t.kind_tags->>'source')='产品型号'
+        SELECT kind_code as "kindCode", sys.f_get_name_i18n_lang(kind_name_i18n, #{i18n}) as "kindName"
+        from sys.t_data_kind t
+        where t.kind_type = '验证标签'
+          and (t.kind_tags ->>'source') = '产品型号'
     </select>
 
     <!-- 获取窑炉类型 -->
@@ -2406,14 +2411,13 @@
 
     <!-- 获取计量单位 -->
     <select id="getModelUnits" resultType="java.util.Map">
-        select
-                tmu.unit_id AS "unitId",
-                tmu.unit_code as "unitCode",
-                tmu.unit_name as "unitName",
-                tmu.unit_scale as "unitScale"
+        select tmu.unit_id    AS "unitId",
+               tmu.unit_code  as "unitCode",
+               tmu.unit_name  as "unitName",
+               tmu.unit_scale as "unitScale"
         from mst.t_model_units as tmu
         where tmu.flg_valid
-              and tmu.fty_id = #{ftyId}
+          and tmu.fty_id = #{ftyId}
         order by tmu.display_no
     </select>
 
@@ -2455,15 +2459,15 @@
 
     <!-- 获取报工项目-->
     <select id="getWorkProject" resultType="java.util.Map">
-        select p.project_id   as "projectIid",
-               p.project_code as "projectCode",
-               p.project_name as "projectName",
-               p.project_kind as "projectKind",
-               sys.f_get_name_i18n_lang(tdk.kind_name_i18n,#{i18n}) as "projectkindName",
-               p.item_kind    as "itemKind",
-               p.station_id   as "stationId",
-               p.pdt_grades   as "pdtGrades",
-               p.pdt_defects  as "pdtDefects",
+        select p.project_id                                          as "projectIid",
+               p.project_code                                        as "projectCode",
+               p.project_name                                        as "projectName",
+               p.project_kind                                        as "projectKind",
+               sys.f_get_name_i18n_lang(tdk.kind_name_i18n, #{i18n}) as "projectkindName",
+               p.item_kind                                           as "itemKind",
+               p.station_id                                          as "stationId",
+               p.pdt_grades                                          as "pdtGrades",
+               p.pdt_defects                                         as "pdtDefects",
                p.remarks
         from mst.t_work_project p
                  left join sys.t_data_kind as tdk
@@ -2538,15 +2542,14 @@
         select count(1)
         from mst.t_product_defect tpd
         where tpd.fty_id = #{ftyId}
-        and tpd.flg_valid
+          and tpd.flg_valid
     </select>
 
 
     <!-- 获取应用-->
     <select id="getApplication" resultType="java.util.Map">
-        select
-        app_code as "appCode",
-        app_name as "appName"
+        select app_code as "appCode",
+               app_name as "appName"
         from sys.t_application
     </select>
 
@@ -2562,17 +2565,16 @@
 
     <!--获取工位打印机-->
     <select id="getWsPrinter" resultType="java.util.Map">
-        select
-            ptwp.wsp_id as "wspId",
-            ptwp.printer_id as "printerId",
-            mtlp.printer_code as "printerCode",
-            mtlp.printer_name   as "printerName",
-            sys.f_code_name(mtlp.printer_code,mtlp.printer_name) AS "printerCodeName"
+        select ptwp.wsp_id                                           as "wspId",
+               ptwp.printer_id                                       as "printerId",
+               mtlp.printer_code                                     as "printerCode",
+               mtlp.printer_name                                     as "printerName",
+               sys.f_code_name(mtlp.printer_code, mtlp.printer_name) AS "printerCodeName"
         from pdm.t_ws_printer ptwp
-            left join mst.t_label_printer mtlp on mtlp.printer_id = ptwp.printer_id
+                 left join mst.t_label_printer mtlp on mtlp.printer_id = ptwp.printer_id
         where ptwp.fty_id = #{ftyId}
           and ptwp.station_id = #{stationId}
-          and  ptwp.flg_valid
+          and ptwp.flg_valid
     </select>
 
     <!--获取仓库-->
@@ -2655,16 +2657,16 @@
 
     <!--获取下拉选-->
     <select id="getSelectType" resultType="java.util.Map">
-        SELECT select_id as "selectId",
-        select_name as "selectName"
+        SELECT select_id   as "selectId",
+               select_name as "selectName"
         FROM mst.t_custom_select_type
         WHERE fty_id = #{ftyId}
-        and flg_valid
+          and flg_valid
     </select>
 
     <!--获取下拉选-->
     <select id="getSelectMagnifier" resultType="java.util.Map">
-        SELECT magnifier_id as "magnifierId",
+        SELECT magnifier_id   as "magnifierId",
                magnifier_name as "magnifierName"
         FROM mst.t_custom_select_magnifier
         WHERE fty_id = #{ftyId}
@@ -2906,10 +2908,10 @@
         tms.flg_valid             as "flgValid"
         from dkic_b.t_mst_supplier tms
         where tms.cp_id = #{cpId}
-        <if test="supplierName!=null and supplierName!=''" >
+        <if test="supplierName!=null and supplierName!=''">
             AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
         </if>
-        <if test="supplierCode!=null and supplierCode!=''" >
+        <if test="supplierCode!=null and supplierCode!=''">
             AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
         </if>
         order by tms.sup_code
@@ -2926,11 +2928,36 @@
         select count(1)
         from dkic_b.t_mst_supplier tms
         where tms.cp_id = #{cpId}
-        <if test="supplierName!=null and supplierName!=''" >
+        <if test="supplierName!=null and supplierName!=''">
             AND tms.sup_name LIKE concat('%', #{supplierName}, '%')
         </if>
-        <if test="supplierCode!=null and supplierCode!=''" >
+        <if test="supplierCode!=null and supplierCode!=''">
             AND tms.sup_code LIKE concat('%', #{supplierCode}, '%')
         </if>
     </select>
+
+    <!--获取渠道 -->
+    <select id="getChannel" resultType="java.util.Map">
+        select c.channel_id   as "channelId",
+               c.channel_code as "channelCode",
+               c.channel_name as "channelName",
+               c.sys_code     as "sysCode",
+               c.display_no   as "displayNo"
+        from dkic_b.t_mst_sale_channel as c
+        where c.flg_valid
+          and c.cp_id = #{cpId}
+        <if test="channel_code!=null and channel_code!=''">
+            AND c.channel_code LIKE concat('%', #{channelCode}, '%')
+        </if>
+        <if test="channel_name!=null and channel_name!=''">
+            AND c.channel_name LIKE concat('%', #{channelName}, '%')
+        </if>
+        order by c.display_no
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+        <if test="limit != null and limit != 0 ">
+            limit #{limit}
+        </if>
+    </select>
 </mapper>

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

@@ -34,5 +34,6 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(GoodsBrandQuery goodsBrandQuery);
+    Integer saveSupplierBrand(String supId,String brandId);
 }
 

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

@@ -43,6 +43,7 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="goodsBrand" property="goodsBrand"/>
+        <result column="supplierName" property="supplierName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -88,7 +89,11 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Join"/>,
-        '商品品牌' AS "goodsBrand"
+        '商品品牌' AS "goodsBrand",
+        (SELECT  COALESCE(array_to_string(array_agg(tsm.sup_name), ','),'')
+        FROM dkic_b.t_mst_supplier_brand tsmb
+        left join dkic_b.t_mst_supplier tsm on tsm.sup_id = tsmb.sup_id
+        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierName"
         FROM dkic_b.t_mst_goods_brand tmgb
         <include refid="Condition"/>
         order by display_no asc
@@ -149,7 +154,7 @@
         <foreach collection="list" index="index" item="item" separator=",">
             (
             <trim suffixOverrides=",">
-                #{brandCode},
+                #{item.brandCode},
                 #{item.brandName},
                 #{item.shortName},
                 #{item.displayNo},
@@ -170,4 +175,10 @@
     </select>
 
 
+    <insert id="saveSupplierBrand">
+        insert into dkic_b.t_mst_supplier_brand
+            (sup_id, brand_id)
+        values (#{supId}::uuid,
+                #{brandId}::uuid)
+    </insert>
 </mapper>

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

@@ -227,51 +227,6 @@
     </select>
 
 
-
-
-
-<!--    <insert id="insert">-->
-<!--        insert into dkic_b.t_mst_goods_category-->
-<!--        (-->
-<!--        <trim suffixOverrides=",">-->
-<!--            cat_code,-->
-<!--            cat_name,-->
-<!--            parent_id,-->
-<!--            display_no,-->
-<!--            top_id,-->
-<!--            level_upper,-->
-<!--            level_lower,-->
-<!--            level_leaf,-->
-<!--            level_no,-->
-<!--            level_code,-->
-<!--            level_name,-->
-<!--            remarks,-->
-<!--            cp_id,-->
-<!--            op_app_code,-->
-<!--        </trim>-->
-<!--        )-->
-<!--        values-->
-
-<!--        (-->
-<!--        <trim suffixOverrides=",">-->
-<!--            #{catCode},-->
-<!--            #{catName},-->
-<!--            #{parentId}::uuid,-->
-<!--            #{displayNo},-->
-<!--            #{topId}::uuid,-->
-<!--            #{levelUpper},-->
-<!--            #{levelLower},-->
-<!--            #{levelLeaf},-->
-<!--            #{levelNo},-->
-<!--            #{levelCode},-->
-<!--            #{levelName},-->
-<!--            #{remarks},-->
-<!--            #{cpId},-->
-<!--            #{opAppCode},-->
-<!--        </trim>-->
-<!--        )-->
-
-<!--    </insert>-->
     <select id="resetLevelGoodsCategory" resultType="java.lang.Boolean">
         select dkic_b.f_reset_level_goods_category(#{cpId}, #{topId}::uuid)
     </select>

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.java

@@ -3,8 +3,10 @@ package com.dk.mdm.mapper.mst;
 import com.dk.mdm.model.pojo.mst.Org;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.OrganizationQuery;
+import com.dk.mdm.model.query.mst.GoodsCategoryQuery;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.mdm.model.response.core.OrganizationResponse;
+import com.dk.mdm.model.vo.mst.OrgVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -36,6 +38,12 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/28 10:23
      */
     int insertBatch(Org org);
+    /**
+     * @desc : 调用函数生成层级
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    Boolean resetLevelOrg(Org org);
 
 
     Integer maxDisplayNo(String  parentID);

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

@@ -143,7 +143,9 @@
             AND ( parent.org_name LIKE concat('%', #{searchText}, '%')
         </if>
     </select>
-
+    <select id="resetLevelOrg" resultType="java.lang.Boolean">
+        select dkic_b.f_reset_level_org(#{cpId}, #{topId}::uuid)
+    </select>
     <!-- 查询表t_mst_org，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT

src/main/java/com/dk/mdm/mapper/mst/SupplierMapper.java

@@ -35,13 +35,13 @@ public interface SupplierMapper extends BaseMapper<Supplier>{
         * @author : 王英杰
         * @date   : 2024/2/29 17:49
         */
-    int insertSupplierBrand(SupplierVo supplierVo);
+    int insertSupplierBrand(Supplier supplierVo);
     /**
      * @desc   : 批量删除 供应商iD对应的品牌
      * @author : 王英杰
      * @date   : 2024/2/29 17:49
      */
-    int   batchDelete (SupplierVo supplierVo);
+    int   batchDelete (Supplier supplierVo);
     /**
      * @desc   : 自动生id
      * @author : 王英杰

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

@@ -163,6 +163,23 @@
             <if test="cpId != null">
                 AND tpo.cp_id = #{cpId}
             </if>
+            <if test="orgIdList != null and orgIdList.size() > 0">
+                AND tpo.org_id  =any(#{orgIdList, typeHandler=uuidListTypeHandler})
+            </if>
+            <if test="staffIdList != null and staffIdList.size() > 0">
+                AND tpo.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
+            </if>
+            <if test="outStatusList != null and outStatusList.size() > 0">
+                AND tpo.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
+            </if>
+            <if test="makeTimeStart != null and makeTimeEnd != null">
+                AND tpo.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpo.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+            </if>
+            <if test="deliveryDateStart != null and deliveryDateEnd != null">
+                AND tpo.delivery_date &gt;= #{deliveryDateStart}::timestamp with time zone
+                AND tpo.delivery_date &lt; #{deliveryDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
         </where>
     </sql>
 
@@ -179,15 +196,16 @@
         SELECT tpo.order_id,
                tpo.order_no,
                tpo.order_type,
+               sys.f_get_name_i18n(tdk1.kind_name_i18n, 'zh_CN') as "orderTypeName",
                tpo.org_id,
-               tmo.org_name         as "orgName",
+               tmo.org_name                                      as "orgName",
                tpo.staff_id,
-               tms.staff_name       as "staffName",
+               tms.staff_name                                    as "staffName",
                tpo.cus_id,
-               tmc.cus_code         as "cusCode",
-               tmc.cus_name         as "cusName",
-               tmc.cus_phone        as "cusPhone",
-               tmdd.data_value      as "cusFromName",
+               tmc.cus_code                                      as "cusCode",
+               tmc.cus_name                                      as "cusName",
+               tmc.cus_phone                                     as "cusPhone",
+               tmdd.data_value                                   as "cusFromName",
                tpo.address_area,
                tpo.address_name,
                tpo.address_no,
@@ -196,14 +214,16 @@
                tpo.contact_name,
                tpo.contact_phone,
                tpo.sales_channel,
-               tmsc.channel_name    as "channelName",
+               tmsc.channel_name                                 as "channelName",
                tpo.delivery_date,
                tpo.sum_quantity,
                tpo.sum_standard,
                tpo.sum_amount,
                tpo.sale_discount,
                tpo.order_status,
+               sys.f_get_name_i18n(tdk2.kind_name_i18n, 'zh_CN') as "orderStatusName",
                tpo.out_status,
+               sys.f_get_name_i18n(tdk3.kind_name_i18n, 'zh_CN') as "outStatusName",
                tpo.outing_qty,
                tpo.outing_amt,
                tpo.out_qty,
@@ -215,15 +235,18 @@
                tpo.amt_residue,
                tpo.remarks,
                tpo.annex_paths,
-               makestaff.staff_name as "makeStaff",
+               makestaff.staff_name                              as "makeStaffName",
                tpo.make_time
         FROM dkic_b.t_psi_order as tpo
-             inner join dkic_b.t_mst_sale_channel tmsc on tpo.sales_channel = tmsc.channel_id
-             inner join dkic_b.t_mst_org tmo on tpo.org_id = tmo.org_id
-             inner join dkic_b.t_mst_staff tms on tpo.staff_id = tms.staff_id
-             inner join dkic_b.t_mst_staff as makestaff on tpo.make_staff = makestaff.staff_id
-             inner join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
-             left join dkic_b.t_mst_dictionary_data tmdd on tmc.cus_from = tmdd.data_id
+                 left join dkic_b.t_mst_sale_channel tmsc on tpo.sales_channel = tmsc.channel_id
+                 left join dkic_b.t_mst_org tmo on tpo.org_id = tmo.org_id
+                 left join dkic_b.t_mst_staff tms on tpo.staff_id = tms.staff_id
+                 left join dkic_b.t_mst_staff as makestaff on tpo.make_staff = makestaff.staff_id
+                 left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
+                 left join dkic_b.t_mst_dictionary_data tmdd on tmc.cus_from = tmdd.data_id
+                 left join sys.t_data_kind as tdk1 on tpo.order_type = tdk1.kind_code
+                 left join sys.t_data_kind as tdk2 on tpo.order_status = tdk2.kind_code
+                 left join sys.t_data_kind as tdk3 on tpo.out_status = tdk3.kind_code
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

src/main/java/com/dk/mdm/model/pojo/mst/Org.java

@@ -40,7 +40,7 @@ public class Org extends PageInfo<Org> implements Serializable {
     /**
      * 组织ID
      */
-    @TableId(value = "org_id", type = IdType.AUTO)
+//    @TableId(value = "org_id", type = IdType.AUTO)
     @ApiModelProperty(value = "组织ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;

src/main/java/com/dk/mdm/model/pojo/mst/Supplier.java

@@ -43,7 +43,7 @@ public class Supplier extends PageInfo<Supplier> implements Serializable {
     /**
      * 供应商ID
      */
-    @TableId(value = "sup_id", type = IdType.AUTO)
+//    @TableId(value = "sup_id", type = IdType.AUTO)
     @ApiModelProperty(value = "供应商ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.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;
 
 /**
  *  销售订单
@@ -406,6 +407,32 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @ApiModelProperty(value = "部门List")
+    private List<String> orgIdList;
+
+    @ApiModelProperty(value = "业务员List")
+    private List<String> staffIdList;
+
+    @ApiModelProperty(value = "出库状态List")
+    private List<String> outStatusList;
+
+    @ApiModelProperty(value = "制单时间开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeStart;
+
+    @ApiModelProperty(value = "制单时间结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeEnd;
+
+    @ApiModelProperty(value = "送货日期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deliveryDateStart;
+
+    @ApiModelProperty(value = "送货日期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deliveryDateEnd;
+
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/GoodsBrandResponse.java

@@ -168,6 +168,8 @@ public class GoodsBrandResponse extends PageInfo<GoodsBrandResponse> implements
 
 
     private String goodsBrand;
+
+    private String supplierName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -429,6 +429,15 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
 
     @ApiModelProperty(value = "制单员")
     private String makeStaffName;
+
+    @ApiModelProperty(value = "订单类型")
+    private String orderTypeName;
+
+    @ApiModelProperty(value = "订单状态")
+    private String orderStatusName;
+
+    @ApiModelProperty(value = "出库状态")
+    private String outStatusName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/mst/GoodsBrandVO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -20,6 +21,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  商品品牌
@@ -113,7 +115,9 @@ public class GoodsBrandVO extends PageInfo<GoodsBrandVO> implements Serializable
     private LocalDateTime opCreateTime;
 
 
-
+    @ApiModelProperty(value = "供应商ids")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> supplierIds;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/mst/OrgVO.java

@@ -82,7 +82,13 @@ public class OrgVO extends PageInfo<OrgVO> implements Serializable {
     @ApiModelProperty(value = "显示顺序")
     private Integer displayNo;
 
-
+    /**
+     * 顶层ID
+     */
+    @Excel(name = "顶层ID")
+    @ApiModelProperty(value = "顶层ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String topId;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1386,4 +1386,15 @@ public class CommonService extends BaseService<Map<String, Object>> {
         data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage")).setList(list).setTotal(total);
         return ResponseResultUtil.success(data);
     }
+
+    /**
+     * @desc   : 获取渠道
+     * @author : 付斌
+     * @date   : 2024-03-02 10:18
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getChannel(Map<String, Object> param) {
+        // 获取公司
+        List<Map<String, Object>> list = commonMapper.getChannel(param);
+        return ResponseResultUtil.success(list);
+    }
 }

src/main/java/com/dk/mdm/service/mst/GoodsBrandService.java

@@ -26,6 +26,7 @@ import com.dk.mdm.model.query.mst.GoodsBrandQuery;
 import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -95,6 +96,12 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
 		goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		goodsBrandMapper.insert(goodsBrand);
+
+		//保存供应商
+		List<String> supplierIds = goodsBrandVO.getSupplierIds();
+		for (String supplierId : supplierIds) {
+			goodsBrandMapper.saveSupplierBrand(supplierId,goodsBrand.getBrandId());
+		}
 		return ResponseResultUtil.success();
 	}
 

src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
@@ -13,14 +14,18 @@ import com.dk.mdm.mapper.mst.OrgMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.OrganizationQuery;
+import com.dk.mdm.model.query.mst.GoodsCategoryQuery;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.mdm.model.response.core.OrganizationResponse;
 import com.dk.mdm.model.vo.core.OrganizationVO;
 import com.dk.mdm.model.vo.mst.OrgVO;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 @Service
 @Transactional
 public class OrgService extends BaseService<Org> {
@@ -43,7 +48,8 @@ public class OrgService extends BaseService<Org> {
 
     @Autowired
     private OrgConvert orgConvert;
-
+    @Autowired
+    private CommonService commonService;
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -66,6 +72,10 @@ public class OrgService extends BaseService<Org> {
     public ResponseResultVO<?> insert(OrgVO orgVO) {
         // 转化实体
         Org organization = orgConvert.convertToPo(orgVO);
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.STAFF.getName(), false);
+
+        organization.setOrgId(codeMap.get("outId").toString());
+//        organization.setOrgCode(codeMap.get("outNote").toString());
 
         //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
         String parentId = organization.getParentId();
@@ -74,8 +84,11 @@ public class OrgService extends BaseService<Org> {
 
         organization.setDisplayNo(maxDisplayNo);
         // 插入组织部门数据
-        return   super.insert(organization);
-//        return result == 1 ? ResponseResultUtil.success(organization) :
+        super.insert(organization);
+        //执行函数
+        orgMapper.resetLevelOrg(new Org().setTopId(organization.getParentId()).setCpId(organization.getCpId()));
+        return ResponseResultUtil.success();
+        //        return result == 1 ? ResponseResultUtil.success(organization) :
 //                ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
     }
 }

src/main/java/com/dk/mdm/service/mst/SupplierService.java

@@ -2,6 +2,7 @@ package com.dk.mdm.service.mst;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -18,6 +19,7 @@ import com.dk.mdm.model.query.mst.SupplierQuery;
 import com.dk.mdm.model.vo.mst.OrgVO;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import com.dk.mdm.model.vo.mst.SupplierVo;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,7 @@ import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Map;
 import java.util.UUID;
 
 @Service
@@ -51,7 +54,8 @@ public class SupplierService extends BaseService<Supplier> {
 
     @Autowired
     private SupplierConvert supplierConvert;
-
+    @Autowired
+    private CommonService commonService;
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -81,18 +85,14 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
 
         try {
+            Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.STAFF.getName(), true);
 
-            // 获取第一个插入操作生成的id
-            String supID = supplierMapper.selectUuid(); // 先生成id
-            supplierVo.setSupId(supID);
-            String supCode = supplierMapper.selectSupCode(supplierVo); //拿着生成的id 传过来的cpid 去生成code
-            supplierVo.setSupCode(supCode); //插入供应商品牌的实体
-            supplier.setSupCode(supCode);  //插入供应商表的实体
-            super.insert(supplier);// 先插入自己的供应商表
-            if (supplierVo.getBrandId() != null) {  //如果有 商品品牌
-                // 设置supplierVo的supplierId
+            supplier.setSupId(codeMap.get("outId").toString());
+            supplier.setSupCode(codeMap.get("outNote").toString());  //插入供应商表的实体
 
-                supplierMapper.insertSupplierBrand(supplierVo); // 向供应商品牌表插入数据
+            super.insert(supplier);// 先插入自己的供应商表
+            if (supplier.getBrandId() != null) {  //如果有 商品品牌
+                supplierMapper.insertSupplierBrand(supplier); // 向供应商品牌表插入数据
             }
             return ResponseResultUtil.success();
         } catch (Exception e) {
@@ -115,10 +115,10 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
         try {
           super.updateByUuid(supplier);// 先更新的供应商表
-            supplierMapper.batchDelete(supplierVo);//批量删除供应商对应的供应商品牌
+            supplierMapper.batchDelete(supplier);//批量删除供应商对应的供应商品牌
             if (supplierVo.getBrandId() != null) {  //如果有 商品品牌
                 // 设置supplierVo的supplierId
-                supplierMapper.insertSupplierBrand(supplierVo); // 向供应商品牌表插入数据
+                supplierMapper.insertSupplierBrand(supplier); // 向供应商品牌表插入数据
             }
           return ResponseResultUtil.success();
         } catch (Exception e) {

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -106,7 +106,6 @@ public class OrderService extends BaseService<Order> {
         Order order = orderConvert.convertToPo(orderVO);
         order.setOrderNo(UUID.randomUUID().toString());
         order.setOrderType(Constant.DocumentType.ORDER_CHASE.getName());
-        order.setSalesChannel("10112024-0228-0000-0000-00000173ec3a");
         // 订单总单保存
         super.insert(order);