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

# Conflicts:
#	src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

src/main/java/com/dk/mdm/controller/FileController.java

@@ -15,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.Optional;
 import java.util.UUID;
 
 @RestController
@@ -34,14 +35,14 @@ public class FileController {
      */
     @ApiOperation(value = "上传文件", notes = "上传文件")
     @PostMapping("upload")
-    public ResponseResultVO<?> upload(@RequestPart("file") MultipartFile file, @RequestParam("folder") String folder) {
+    public ResponseResultVO<?> upload(@RequestPart("file") MultipartFile file, @RequestParam("folder") String folder,@RequestParam(required=false) String uuid) {
         if (file.isEmpty()) {
             return ResponseResultUtil.error(ErrorCodeEnum.FILE_UPLOAD_FAIL.getCode(), ErrorCodeEnum.FILE_UPLOAD_FAIL.getMessage());
         }
 
         //生产文件名称
         String fileName = file.getOriginalFilename();
-        String uuidName = UUID.randomUUID().toString() + "." + fileName.substring(fileName.lastIndexOf(".") + 1);
+        String uuidName = Optional.ofNullable(uuid).orElse(UUID.randomUUID().toString()) + "." + fileName.substring(fileName.lastIndexOf(".") + 1);
         String filePath = this.createDirByPath(folder) + uuidName;
         File dest = new File(filePath);
 

src/main/java/com/dk/mdm/controller/ivt/inbound/InboundItemController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.ivt.inbound.InboundItemService;
 
+import javax.validation.Valid;
+
 @Api(tags = "入库明细API接口")
 @RestController
 @RequestMapping("/ivt/inboundItem")
@@ -54,4 +56,33 @@ public class InboundItemController{
         return inboundItemService.insert(inboundItemVO);
     }
 
+
+
+    /**
+     * @desc   : 条件查询(入库成本核对用)
+     * @author : 常皓宁
+     * @date   : 2024/3/13 14:35
+     */
+    @ApiOperation(
+            value = "分页、关联、条件查询",
+            notes = "分页、关联、条件查询"
+    )
+    @PostMapping({"select_cost_check"})
+    public ResponseResultVO<PageList<InboundItemResponse>> selectCostCheck(@RequestBody InboundItemQuery inboundItemQuery) {
+        return inboundItemService.selectCostCheck(inboundItemQuery);
+    }
+
+    /**
+     * @desc   : 入库成本核对
+     * @author : 常皓宁
+     * @date   : 2024/4/17 15:24
+     */
+    @ApiOperation(
+            value = "入库成本核对",
+            notes = "入库成本核对"
+    )
+    @PostMapping({"cost_check_ok"})
+    public ResponseResultVO<?> CostCheckOk(@Valid @RequestBody InboundItemQuery inboundItemQuery) {
+        return inboundItemService.CostCheckOk(inboundItemQuery);
+    }
 }

src/main/java/com/dk/mdm/controller/mst/OrgController.java

@@ -37,6 +37,16 @@ public class OrgController{
     public ResponseResultVO<PageList<OrgResponse>> selectByCond(@RequestBody OrgQuery orgQuery) {
         return orgService.selectByCond(orgQuery);
     }
+    /**
+     * @desc   : 条件查询
+     * @author : 王英杰
+     * @date   : 2024/2/26 14:02
+     */
+    @ApiOperation( value = "分页、关联、条件查询", notes = "分页、关联、条件查询" )
+    @PostMapping({"list_by_tree"})
+    public ResponseResultVO<PageList<OrgResponse>> selectByCondTree(@RequestBody OrgQuery orgQuery) {
+        return orgService.selectByCondTree(orgQuery);
+    }
 
    /**
        * @desc   : 新建组织部门

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -197,8 +197,11 @@ public class StaffController {
      * @date : 2023-11-02 16:27
      */
     @PostMapping({"/feign_get_experience"})
-    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody StaffQuery staffQuery) {
-        log.info("feign_get_experience1" + staffQuery.toString());
+    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> map) {
+        log.info("feign_get_experience1" + map.toString());
+        StaffQuery staffQuery = new StaffQuery();
+        staffQuery.setCpId(Integer.parseInt(map.get("cpId").toString()));
+        staffQuery.setStaffCode(map.get("staffCode").toString());
         ResponseResultVO<PageList<StaffResponse>> pageListResponseResultVO = staffService.selectByCond(staffQuery);
         log.info("feign_get_experience2" + pageListResponseResultVO.toString());
         return ResponseResultUtil.success(pageListResponseResultVO.getData().getList().get(0));
@@ -214,7 +217,7 @@ public class StaffController {
             notes = "登录后获取信息"
     )
     @PostMapping("get_info_after_login")
-    public ResponseResultVO<Dictionary<String,Object>> getInfoAfterLogin(@RequestBody Map<String, Object> param) {
+    public ResponseResultVO<Dictionary<String, Object>> getInfoAfterLogin(@RequestBody Map<String, Object> param) {
         return staffService.getInfoAfterLogin(param);
     }
 

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -79,6 +79,25 @@ public class ReportController  {
     public ResponseResultVO<List<Map<String, Object>>> getInboundDetailReport(@RequestBody Map<String, Object> param) {
         return reportService.getInboundDetailReport(param);
     }
+
+    /**
+     * @desc   : 客户收款明细表
+     * @author : 宋扬
+     * @date   : 2024/4/16 11:27
+     */
+    @PostMapping("rec_pay_detail_report")
+    public ResponseResultVO<List<Map<String, Object>>> getRecPayDetailReport(@RequestBody Map<String, Object> param) {
+        return reportService.getRecPayDetailReport(param);
+    }
+    /**
+     * @desc   : 销售跟踪表 列表查询
+     * @author : 于继渤
+     * @date   : 2024/4/16 11:27
+     */
+    @PostMapping("sales_tracking_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getSalesTrackingReport(@RequestBody Map<String, Object> param) {
+        return reportService.getSalesTrackingReport(param);
+    }
 }
 
 

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

@@ -332,7 +332,7 @@
     <!-- 获取数据字典项目 -->
     <select id="getDictionaryItemData" resultType="java.util.Map">
         SELECT stdi.dict_code                                         AS "dictCode",
-               sys.f_get_name_i18n_lang(stdi.dict_name_i18n, 'zh_CN') AS "dictName"
+               sys.f_get_name_i18n_lang(stdi.dict_name_i18n,  #{i18n}) AS "dictName"
         FROM sys.t_dictionary_item stdi
         WHERE stdi.flg_valid
           AND stdi.level_no NOT IN ('1')
@@ -622,7 +622,7 @@
         select tms.sup_code       as "supplierCode",
         tms.sup_name              as "supplierName",
         tms.sup_id                as "supplierId",
-        sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS  "supplierType",
+        sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) AS  "supplierType",
         tms.contact_name          as "contactName",
         tms.contact_phone         as "contactPhone",
         tms.flg_valid             as "flgValid"
@@ -1673,7 +1673,7 @@
         select tpt.purview_name_i18n as purviewName,
                tpt.purview_code as "code",
                "row_number"() OVER (ORDER BY tpt.display_no) as "id",
-               sys.f_get_name_i18n(tpt.purview_name_i18n,'zh_CN') AS name
+               sys.f_get_name_i18n(tpt.purview_name_i18n, #{i18n}) AS name
         from sys.t_purview_type tpt
         where tpt.flg_valid
         order by tpt.display_no

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

@@ -6,6 +6,7 @@ import com.dk.mdm.model.query.ivt.CheckItemQuery;
 import com.dk.mdm.model.query.ivt.FreezeItemQuery;
 import com.dk.mdm.model.response.ivt.CheckItemResponse;
 import com.dk.mdm.model.response.ivt.FreezeItemResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface CheckItemMapper extends BaseMapper<CheckItem>{
      * @author : 宋扬
      * @date   : 2024/3/19 16:15
      */
-    CheckItemResponse selectById(String id);
+    CheckItemResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 根据条件进行查询（数量）

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

@@ -194,7 +194,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_check_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_check_item的一行数据 -->

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

@@ -11,7 +11,7 @@
     <sql id="Base_Column_List_Respons">
         ck.check_id, ck.check_no, ck.org_id, ck.staff_id, ck.check_date, ck.wh_id, ck.make_staff, ck.make_time, ck.flg_valid
     , ck.remarks, ck.flg_lock,ck.check_status
-    ,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS "checkStatusName"
+    ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} ) AS "checkStatusName"
     ,staff.staff_name AS "checkStaff"
     ,org.org_name AS "checkOrg"
     ,mstaff.staff_name AS "makeStaffName"
@@ -231,7 +231,7 @@
         lEFT JOIN dkic_b.t_mst_staff AS mstaff ON mstaff.staff_id=ck.make_staff
         LEFT JOIN sys.t_data_kind AS tdk  ON tdk.kind_code = ck.check_status
         lEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=ck.wh_id
-        WHERE ck.check_id = #{checkId}::uuid
+        WHERE ck.check_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_check的一行数据 -->

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

@@ -6,6 +6,7 @@ import com.dk.mdm.model.query.ivt.FreezeItemQuery;
 import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.response.ivt.FreezeItemResponse;
 import com.dk.mdm.model.vo.ivt.FreezeItemVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface FreezeItemMapper extends BaseMapper<FreezeItem>{
      * @author : 宋扬
      * @date   : 2024/3/19 16:15
      */
-    FreezeItemResponse selectById(String id);
+    FreezeItemResponse selectById(@Param("id") String id);
 
    /**
     * @desc   : 根据条件进行查询（数量）

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

@@ -119,7 +119,7 @@
             item.item_id, item.freeze_id, item.item_index, item.sku_id, item.freeze_qty, item.unfreeze_qty
              , item.surplus_qty, item.remarks, item.inv_id, item.flg_valid,item.cp_id
         FROM dkic_b.t_psi_freeze_item AS item
-        WHERE item.item_id = #{itemId}::uuid
+        WHERE item.item_id = #{id}::uuid
     </select>
 
 

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

@@ -6,6 +6,7 @@ import com.dk.mdm.model.query.ivt.FreezeQuery;
 import com.dk.mdm.model.query.mst.MoneyAccountQuery;
 import com.dk.mdm.model.response.ivt.FreezeResponse;
 import com.dk.mdm.model.response.mst.MoneyAccountResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -35,7 +36,7 @@ public interface FreezeMapper extends BaseMapper<Freeze>{
      * @author : 宋扬
      * @date   : 2024-03-13 9:25
      */
-    FreezeResponse selectById(String id);
+    FreezeResponse selectById(@Param("id") String id);
 
 
 }

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

@@ -11,7 +11,7 @@
     <!-- 冻结一览查询列 -->
     <sql id="Base_Column_List_Respons">
         fre.freeze_id,fre.freeze_no,fre.cus_id,fre.org_id,fre.staff_id,fre.freeze_status
-        ,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS "freezeStatusName"
+        ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} ) AS "freezeStatusName"
         ,fre.freeze_date,fre.auto_unfreeze_date ,fre.sum_quantity, fre.remarks, fre.make_staff
         , fre.make_time, fre.flg_valid,fre.cp_id,cus.cus_phone
         ,cus.cus_name,staff.staff_name,org.org_name,mstaff.staff_name AS "makeStaffName"
@@ -151,7 +151,7 @@
         lEFT JOIN dkic_b.t_mst_org AS org ON org.org_id=fre.org_id
         lEFT JOIN dkic_b.t_mst_staff AS mstaff ON mstaff.staff_id=fre.make_staff
         LEFT JOIN sys.t_data_kind AS tdk   ON tdk.kind_code = fre.freeze_status
-        WHERE fre.freeze_id = #{freezeId}::uuid
+        WHERE fre.freeze_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_freeze的一行数据 -->

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

@@ -22,7 +22,7 @@ public interface InOutRecordMapper extends BaseMapper<InOutRecord>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InOutRecordResponse selectById(@Param("recordId") String recordId);
+    InOutRecordResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 条件查询

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

@@ -150,7 +150,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_in_out_record tpior
-        WHERE tpior.record_id = #{recordId}::uuid
+        WHERE tpior.record_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_in_out_record的一行数据 -->

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

@@ -33,13 +33,20 @@ public interface InboundItemMapper extends BaseMapper<InboundItem>{
      */
     Long countByCond(InboundItemQuery inboundItemQuery);
 
+    /**
+     * @desc   : 条件查询 (入库成本核对用)
+     * @author : 常皓宁
+     * @date   : 2024/4/17 10:15
+     */
+    List<InboundItemResponse> selectCostCheck(InboundItemQuery inboundItemQuery);
+
 
     /**
      * @desc   : 根据id查询
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InboundItemResponse selectById(@Param("itemId") String itemId);
+    InboundItemResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 修改金额数量

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

@@ -234,7 +234,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_inbound_item tpii
-        WHERE tpii.item_id = #{itemId}::uuid
+        WHERE tpii.item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_inbound_item的一行数据 -->
@@ -498,4 +498,65 @@
             limit #{end} offset #{start}
         </if>
     </select>
+
+
+
+    <!-- 条件查询 (入库成本核对用) -->
+    <select id="selectCostCheck" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        ,tpid.into_no as "intoNo"
+        ,tmgs.sku_code  as "skuCode"
+        ,tmgs.sku_model as "skuModel"
+        ,tmgs.sku_name  as "skuName"
+        ,tmgs.sku_spec  as "skuSpec"
+        ,tmgb.brand_name  as "brandName"
+        ,tmgb.short_name  as "shortName"
+        ,tpp.pur_id as "purId"
+        ,tpp.pur_no as "purNo"
+        ,tppi.item_qty as "purItemQty"
+        ,tppi.intoing_qty as "purItemIntoingQty"
+        ,tppi.into_qty as "purItemIntoQty"
+        ,tmp.sup_code as "supCode"
+        ,tmp.sup_name as "supName"
+        ,tpiv.inv_qty
+        FROM dkic_b.t_psi_inbound_item tpii
+        left join dkic_b.t_psi_inbound tpid on tpii.into_id = tpid.into_id
+        left join dkic_b.t_psi_inventory tpiv on tpiv.inv_id = tpii.inv_id
+        left join dkic_b.t_psi_purchase_item tppi on tppi.item_id = tpii.from_item_id
+        left join dkic_b.t_psi_purchase tpp on tpp.pur_id = tpii.from_id
+        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
+        left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
+        left join dkic_b.t_psi_inventory tpi on tpi.inv_id = tpii.inv_id
+        left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpii.wh_id
+        Left join dkic_b.t_mst_supplier tmp on tpid.sup_id = tmp.sup_id
+        <where>
+            tpii.flg_valid
+            and tpii.into_qty &lt;&gt; 0
+            <if test="intoId != null and intoId != ''">
+                AND tpii.into_id = #{intoId}::uuid
+            </if>
+            <if test="intoNo != null and intoNo != ''">
+                AND tpid.into_no LIKE concat('%',my_ex.likequery(#{intoNo}),'%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND tpid.sup_id = #{supId}::uuid
+            </if>
+            <if test="intoDateStart != null">
+                AND tpid.into_date &gt;= #{intoDateStart}::timestamp with time zone
+            </if>
+            <if test="intoDateEnd != null">
+                AND tpid.into_date &lt; #{intoDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
+            <if test="skuName != null and skuName!='' ">
+                AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
+            </if>
+            <if test="cpId != null">
+                AND tpii.cp_id = #{cpId}
+            </if>
+        </where>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
 </mapper>

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

@@ -39,7 +39,7 @@ public interface InboundMapper extends BaseMapper<Inbound>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InboundResponse selectById(@Param("intoId") String intoId);
+    InboundResponse selectById(@Param("id") String id);
 
 
     /**
@@ -107,14 +107,14 @@ public interface InboundMapper extends BaseMapper<Inbound>{
      * @author : 于继渤
      * @date : 2024/3/6 10:36
      */
-    InboundResponse selectInboundReturnById(@Param("intoId") String intoId);
+    InboundResponse selectInboundReturnById(@Param("id") String id);
 
     /**
      * @desc   : 根据来源id查询
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InboundResponse selectByFromId(@Param("fromId") String fromId);
+    InboundResponse selectByFromId(@Param("id") String id);
 
 
 }

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

@@ -345,8 +345,8 @@
         tmc.cus_phone                                     as "cusPhone",
         tmc.cus_from                                      as "cusFrom",
         makestaff.staff_name                              as "makeStaffName",
-        sys.f_get_name_i18n(tdktype.kind_name_i18n, 'zh_CN') AS  "intoTypeName",
-        sys.f_get_name_i18n(tdk.kind_name_i18n, 'zh_CN') AS  "intoStatusName",
+        sys.f_get_name_i18n(tdktype.kind_name_i18n,  #{i18n}) AS  "intoTypeName",
+        sys.f_get_name_i18n(tdk.kind_name_i18n,  #{i18n}) AS  "intoStatusName",
         tmd.data_value                                   as into_reason_name,
         tmp.return_address,
         case when tpi.receivable_id is null then false
@@ -406,7 +406,7 @@
         Left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
         left join t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
-        WHERE tpi.into_id = #{intoId}::uuid
+        WHERE tpi.into_id = #{id}::uuid
         and tpi.flg_valid
     </select>
 
@@ -1018,8 +1018,8 @@
         ,tms.staff_name
         ,tmw.wh_name
         ,tms1.staff_name as make_staff_name
-        ,sys.f_get_name_i18n(tdktype.kind_name_i18n, 'zh_CN') AS  into_type_name
-        ,sys.f_get_name_i18n(tdk.kind_name_i18n, 'zh_CN') AS into_status_name
+        ,sys.f_get_name_i18n(tdktype.kind_name_i18n,  #{i18n}) AS  into_type_name
+        ,sys.f_get_name_i18n(tdk.kind_name_i18n,  #{i18n}) AS into_status_name
         ,tmd.data_value as into_reason_name
         ,tmp.return_address
         ,tmp.contact_name
@@ -1076,7 +1076,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_inbound tpi
-        WHERE tpi.from_id = #{fromId}::uuid
+        WHERE tpi.from_id = #{id}::uuid
         and tpi.flg_valid
     </select>
 </mapper>

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

@@ -35,7 +35,7 @@ public interface IntoReturnItemMapper extends BaseMapper<IntoReturnItem>{
      * @date   : 2024/3/11 14:59
      * @author : 寇珊珊
      */
-    IntoReturnItemResponse selectById(@Param("itemId") String itemId);
+    IntoReturnItemResponse selectById(@Param("id") String id);
 
 
 }

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

@@ -245,7 +245,7 @@
         SELECT
         <include refid="Base_Column_List_Join"/>
         FROM dkic_b.t_psi_into_return_item tpiri
-        WHERE tpiri.item_id = #{itemId}::uuid
+        WHERE tpiri.item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_into_return_item的一行数据 -->

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

@@ -43,7 +43,7 @@ public interface IntoReturnMapper extends BaseMapper<IntoReturn>{
      * @date   : 2024/3/11 14:59
      * @author : 寇珊珊
      */
-    IntoReturnResponse selectById(@Param("returnId") String returnId);
+    IntoReturnResponse selectById(@Param("id") String id);
 
 
     IntoReturnResponse selectByIntoReturnQuery(IntoReturnQuery intoReturnQuery);

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

@@ -337,8 +337,8 @@
         tmsf.staff_code AS staff_code,
         tmo.org_name AS org_name,
         tmo.org_code AS org_code,
-        tdk1.kind_name_i18n ->> 'zh_CN' AS out_status_name,
-        tdk2.kind_name_i18n ->> 'zh_CN' AS return_status_name
+        tdk1.kind_name_i18n ->>  #{i18n} AS out_status_name,
+        tdk2.kind_name_i18n ->>  #{i18n} AS return_status_name
     </sql>
 
     <!-- 查询表t_psi_into_return，（条件查询+分页）列表 -->
@@ -375,7 +375,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_into_return tpir
-        WHERE tpir.return_id = #{returnId}::uuid
+        WHERE tpir.return_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_into_return的一行数据 -->

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

@@ -23,7 +23,7 @@ public interface InventoryBatchMapper extends BaseMapper<InventoryBatch>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InventoryBatchResponse selectById(@Param("batchId") String batchId);
+    InventoryBatchResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 条件查询

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

@@ -154,7 +154,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_inventory_batch tpib
-        WHERE tpib.batch_id = #{batchId}::uuid
+        WHERE tpib.batch_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_inventory_batch的一行数据 -->

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

@@ -25,7 +25,7 @@ public interface InventoryMapper extends BaseMapper<Inventory>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InventoryResponse selectById(@Param("invId") String invId);
+    InventoryResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 条件查询

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

@@ -153,7 +153,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_inventory tpi
-        WHERE tpi.inv_id = #{invId}::uuid
+        WHERE tpi.inv_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_inventory的一行数据 -->

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

@@ -24,7 +24,7 @@ public interface OutboundItemCostMapper extends BaseMapper<OutboundItemCost>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    OutboundItemCostResponse selectById(@Param("batchId") String batchId);
+    OutboundItemCostResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 条件查询

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

@@ -102,7 +102,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_outbound_item_cost tpoic
-        WHERE tpoic.batch_id = #{batchId}::uuid
+        WHERE tpoic.batch_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_outbound_item_cost的一行数据 -->

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

@@ -71,7 +71,7 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      * @date   : 2024/3/18 13:41
      * @author : 寇珊珊
      */
-    OutboundItemResponse selectById(@Param("itemId") String itemId);
+    OutboundItemResponse selectById(@Param("id") String id);
     
     /**
      * @desc   : 修改退货信息

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

@@ -234,7 +234,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_outbound_item tpoi
-        WHERE tpoi.item_id = #{itemId}::uuid
+        WHERE tpoi.item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_outbound_item的一行数据 -->

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

@@ -36,7 +36,7 @@ public interface OutboundMapper extends BaseMapper<Outbound>{
      * @author : 付斌
      * @date   : 2024-03-03 9:25
      */
-    OutboundResponse selectById(String id);
+    OutboundResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 获取出库信息（新建退货用）

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

@@ -136,7 +136,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_psi_transfer_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_transfer_item的一行数据 -->

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

@@ -14,7 +14,7 @@
         trf.transfer_id, trf.transfer_no, trf.transfer_type, trf.org_id, trf.staff_id, trf.transfer_date, trf.o_wh_id
         , trf.wh_id, trf.o_non_std_code, trf.non_std_code, trf.remarks, trf.make_staff, trf.make_time
         , trf.flg_valid, trf.cp_id
-         ,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS "transferStatusName"
+         ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} ) AS "transferStatusName"
         ,staff.staff_name AS "transferStaff"
         ,org.org_name AS "transferOrg"
         ,mstaff.staff_name AS "makeStaffName"
@@ -211,7 +211,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_psi_transfer
-        WHERE transfer_id = #{transferId}::uuid
+        WHERE transfer_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_transfer的一行数据 -->

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.java

@@ -35,11 +35,32 @@ public interface AccountItemMapper extends BaseMapper<AccountItem>{
     List<AccountItemResponse> getPayableAccountItem(AccountItemQuery accountItemQuery);
 
     /**
+     * @desc : 查询应收账款明细(锁表)
+     * @author : 付斌
+     * @date : 2024-02-28 10:18
+     */
+    List<AccountItemResponse> getReceivableAccountItemForUpdate(AccountItemQuery accountItemQuery);
+
+    /**
      * @desc   : 查询收款总额
      * @author : 付斌
      * @date   : 2024-03-09 11:36
      */
-    Map<String, Object> getSumAmtRecPay(String id);
+    Map<String, Object> getSumAmtRec(String id);
+
+    /**
+     * @desc   : 查询收款总额（锁定金额）
+     * @author : 付斌
+     * @date   : 2024-03-09 11:36
+     */
+    Map<String, Object> getSumAmtRecLock(String id);
+
+    /**
+     * @desc   : 查询付款总额
+     * @author : 付斌
+     * @date   : 2024-03-09 11:36
+     */
+    Map<String, Object> getSumAmtPay(String id);
 
     /**
      * @desc   : 查询订单未出库金额

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -5,8 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id
-        , acc_item_type, object_id, org_id, staff_id, biznis_type, biznis_id, biznis_no, acc_date, rec_status, amt_rec, amt_pay, amt_should, amt_handle, amt_waive, amt_residue, remarks, make_staff, make_time, flg_valid, cp_id
+        item_id, acc_item_type, object_id, org_id, staff_id, biznis_type, biznis_id, biznis_no, acc_date, rec_status, amt_rec, amt_pay, amt_should, amt_handle, amt_waive, amt_residue, flg_lock, remarks, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -27,6 +26,7 @@
         <result column="amt_handle" property="amtHandle"/>
         <result column="amt_waive" property="amtWaive"/>
         <result column="amt_residue" property="amtResidue"/>
+        <result column="flg_lock" property="flgLock"/>
         <result column="remarks" property="remarks"/>
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
@@ -52,6 +52,7 @@
         <result column="amt_handle" property="amtHandle"/>
         <result column="amt_waive" property="amtWaive"/>
         <result column="amt_residue" property="amtResidue"/>
+        <result column="flg_lock" property="flgLock"/>
         <result column="remarks" property="remarks"/>
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
@@ -112,6 +113,9 @@
         <if test="amtResidue != null">
             AND t.amt_residue = #{amtResidue}
         </if>
+        <if test="flgLock != null">
+            AND t.flg_lock = #{flgLock}
+        </if>
         <if test="remarks != null and remarks != ''">
             AND t.remarks = #{remarks}
         </if>
@@ -131,6 +135,9 @@
         <if test="formType == 'refund'">
             AND t.amt_residue <![CDATA[ < ]]> 0
         </if>
+        <if test="orderId != null">
+            AND tpo.from_id = #{orderId}::uuid
+        </if>
     </sql>
 
     <sql id="idsForeach">
@@ -187,48 +194,48 @@
     <!-- 查询应收账款明细 -->
     <select id="getReceivableAccountItem" resultMap="BaseResultMapResponse">
         SELECT t.item_id,
-        t.item_id as "accItemId",
-        t.acc_item_type,
-        t.object_id,
-        tmc.cus_code as "cusCode",
-        tmc.cus_name as "cusName",
-        tmc.cus_phone as "cusPhone",
-        tmc.address_full as "addressFull",
-        t.org_id,
-        tmo.org_name as "orgName",
-        t.staff_id,
-        tms.staff_name as "staffName",
-        t.biznis_type,
-        t.biznis_id,
-        t.biznis_no,
-        t.acc_date,
-        t.rec_status,
-        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "recStatusName",
-        coalesce(sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}), '其他收入') as "biznisTypeName",
-        t.amt_rec,
-        t.amt_pay,
-        t.amt_should,
-        t.amt_handle,
-        t.amt_waive,
-        t.amt_residue as "amtNotHandle",
-        t.amt_residue as "amtReceivableHandle",
-        t.amt_residue,
-        t.remarks,
-        t.make_staff,
-        t.make_time,
-        t.flg_valid,
-        t.cp_id
+               t.item_id        as "accItemId",
+               t.acc_item_type,
+               t.object_id,
+               tmc.cus_code     as "cusCode",
+               tmc.cus_name     as "cusName",
+               tmc.cus_phone    as "cusPhone",
+               tmc.address_full as "addressFull",
+               t.org_id,
+               tmo.org_name     as "orgName",
+               t.staff_id,
+               tms.staff_name   as "staffName",
+               t.biznis_type,
+               t.biznis_id,
+               t.biznis_no,
+               t.acc_date,
+               t.rec_status,
+               sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "recStatusName",
+               coalesce(sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}), '其他收入') as "biznisTypeName",
+               t.amt_rec,
+               t.amt_pay,
+               t.amt_should,
+               t.amt_handle,
+               t.amt_waive,
+               t.amt_residue    as "amtNotHandle",
+               t.amt_residue    as "amtReceivableHandle",
+               t.amt_residue,
+               t.remarks,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id
         FROM dkic_b.t_mac_account_item as t
-        left join dkic_b.t_psi_outbound as tpo on tpo.out_id = t.biznis_id and t.biznis_type = 't_psi_outbound'
-        LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = tpo.out_type
-        left join dkic_b.t_mac_other_receivable as tmor
-        on tmor.receivable_id = t.biznis_id and t.biznis_type = 't_mac_other_receivable'
-        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
-        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
-        left join sys.t_data_kind as tdk1 on t.rec_status = tdk1.kind_code
+                 left join dkic_b.t_psi_outbound as tpo on tpo.out_id = t.biznis_id and t.biznis_type = 't_psi_outbound'
+                 LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = tpo.out_type
+                 left join dkic_b.t_mac_other_receivable as tmor
+                           on tmor.receivable_id = t.biznis_id and t.biznis_type = 't_mac_other_receivable'
+                 left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
+                 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
+                 left join sys.t_data_kind as tdk1 on t.rec_status = tdk1.kind_code
         where t.flg_valid
-        and t.acc_item_type = '账款类型-应收'
+          and t.acc_item_type = '账款类型-应收'
         and t.amt_residue <![CDATA[ <> ]]> 0
         <include refid="Condition"/>
         order by t.acc_date
@@ -240,45 +247,45 @@
     <!-- 查询应付账款明细 -->
     <select id="getPayableAccountItem" resultMap="BaseResultMapResponse">
         SELECT t.item_id,
-        t.item_id as "accItemId",
-        t.acc_item_type,
-        t.object_id,
-        supplier.sup_code as "supCode",
-        supplier.sup_name as "supName",
-        t.org_id,
-        tmo.org_name as "orgName",
-        t.staff_id,
-        tms.staff_name as "staffName",
-        t.biznis_type,
-        t.biznis_id,
-        t.biznis_no,
-        t.acc_date,
-        t.rec_status,
-        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "recStatusName",
-        sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "biznisTypeName",
-        t.amt_rec,
-        t.amt_pay,
-        t.amt_should,
-        t.amt_handle,
-        t.amt_waive,
-        t.amt_residue,
-        t.amt_residue as "amtNotHandle",
-        t.amt_residue as "amtPayableHandle",
-        t.remarks,
-        t.make_staff,
-        t.make_time,
-        t.flg_valid,
-        t.cp_id
+               t.item_id         as "accItemId",
+               t.acc_item_type,
+               t.object_id,
+               supplier.sup_code as "supCode",
+               supplier.sup_name as "supName",
+               t.org_id,
+               tmo.org_name      as "orgName",
+               t.staff_id,
+               tms.staff_name    as "staffName",
+               t.biznis_type,
+               t.biznis_id,
+               t.biznis_no,
+               t.acc_date,
+               t.rec_status,
+               sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "recStatusName",
+               sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "biznisTypeName",
+               t.amt_rec,
+               t.amt_pay,
+               t.amt_should,
+               t.amt_handle,
+               t.amt_waive,
+               t.amt_residue,
+               t.amt_residue     as "amtNotHandle",
+               t.amt_residue     as "amtPayableHandle",
+               t.remarks,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id
         FROM dkic_b.t_mac_account_item as t
-        left join dkic_b.t_psi_inbound as tpi on tpi.into_id = t.biznis_id and t.biznis_type = 't_psi_inbound'
-        LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = tpi.into_type
-        left join dkic_b.t_mst_supplier supplier on supplier.sup_id = t.object_id
-        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
-        left join sys.t_data_kind as tdk1 on t.rec_status = tdk1.kind_code
+                 left join dkic_b.t_psi_inbound as tpi on tpi.into_id = t.biznis_id and t.biznis_type = 't_psi_inbound'
+                 LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = tpi.into_type
+                 left join dkic_b.t_mst_supplier supplier on supplier.sup_id = t.object_id
+                 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
+                 left join sys.t_data_kind as tdk1 on t.rec_status = tdk1.kind_code
         where t.flg_valid
-        and t.acc_item_type = '账款类型-应付'
-        and t.amt_residue <![CDATA[ <> ]]> 0
+          and t.acc_item_type = '账款类型-应付'
+          and t.amt_residue <![CDATA[<>]]> 0
         <include refid="Condition"/>
         order by t.acc_date
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -286,12 +293,49 @@
         </if>
     </select>
 
+    <!-- 查询应收账款明细 -->
+    <select id="getReceivableAccountItemForUpdate" resultMap="BaseResultMapResponse">
+        SELECT t.item_id,
+               t.item_id     as "accItemId",
+               t.acc_item_type,
+               t.object_id,
+               t.org_id,
+               t.staff_id,
+               t.biznis_type,
+               t.biznis_id,
+               t.biznis_no,
+               t.acc_date,
+               t.rec_status,
+               t.amt_rec,
+               t.amt_pay,
+               t.amt_should,
+               t.amt_handle,
+               t.amt_waive,
+               t.amt_residue as "amtNotHandle",
+               t.amt_residue as "amtReceivableHandle",
+               t.amt_residue,
+               t.remarks,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id
+        FROM dkic_b.t_mac_account_item as t
+                 inner join dkic_b.t_psi_outbound as tpo on tpo.out_id = t.biznis_id and t.biznis_type = 't_psi_outbound'
+        where t.flg_valid
+          and t.acc_item_type = '账款类型-应收'
+          and t.amt_residue <![CDATA[<>]]> 0
+          AND t.object_id = #{objectId}::uuid
+          AND tpo.from_id = #{orderId}::uuid
+        order by t.acc_date
+            for update
+    </select>
+
     <!-- 根据主键查询表t_mac_account_item的一行数据 -->
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_account_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_account_item的一行数据 -->
@@ -368,12 +412,32 @@
     </insert>
 
     <!-- 查询收款总额 -->
-    <select id="getSumAmtRecPay" resultType="java.util.Map">
-        SELECT COALESCE(sum(tmai.amt_rec), 0) as "sumAmtRec",
-               COALESCE(sum(tmai.amt_pay), 0) as "sumAmtPay"
-        FROM dkic_b.t_mac_account_item as tmai
-        where tmai.flg_valid
-          and tmai.object_id = #{id}::uuid
+    <select id="getSumAmtRec" resultType="java.util.Map">
+        SELECT COALESCE(sum(t.amt_rec), 0) as "sumAmtRec"
+        FROM dkic_b.t_mac_account_item as t
+        where t.flg_valid
+          and t.flg_lock = false
+          and t.acc_item_type = '账款类型-收款'
+          and t.object_id = #{id}::uuid
+    </select>
+
+    <!-- 查询收款总额（锁定金额） -->
+    <select id="getSumAmtRecLock" resultType="java.util.Map">
+        SELECT COALESCE(sum(t.amt_rec), 0) as "sumAmtRecLock"
+        FROM dkic_b.t_mac_account_item as t
+        where t.flg_valid
+          and t.flg_lock
+          and t.acc_item_type = '账款类型-收款'
+          and t.object_id = #{id}::uuid
+    </select>
+
+    <!-- 查询付款总额 -->
+    <select id="getSumAmtPay" resultType="java.util.Map">
+        SELECT COALESCE(sum(t.amt_pay), 0) as "sumAmtPay"
+        FROM dkic_b.t_mac_account_item as t
+        where t.flg_valid
+          and t.acc_item_type = '账款类型-付款'
+          and t.object_id = #{id}::uuid
     </select>
 
     <!-- 查询订单未出库金额  -->
@@ -381,7 +445,7 @@
         SELECT COALESCE(sum(tpo.sum_amount - tpo.out_amt), 0) as "sumAmtOrder"
         FROM dkic_b.t_psi_order as tpo
         where tpo.flg_valid
-          and tpo.out_status in('出库状态-出库中','出库状态-待出库')
+          and tpo.out_status in ('出库状态-出库中', '出库状态-待出库')
           and tpo.cus_id = #{id}::uuid
     </select>
 
@@ -390,7 +454,7 @@
         SELECT COALESCE(sum(tpp.sum_amount - tpp.into_amt), 0) as "sumAmtPur"
         FROM dkic_b.t_psi_purchase as tpp
         where tpp.flg_valid
-          and tpp.into_status in('入库状态-待入库','入库状态-入库中')
+          and tpp.into_status in ('入库状态-待入库', '入库状态-入库中')
           and tpp.sup_id = #{id}::uuid
     </select>
 

src/main/java/com/dk/mdm/mapper/mac/AccountMapper.java

@@ -17,6 +17,6 @@ public interface AccountMapper extends BaseMapper<Account>{
      * @date   : 2024/3/9 9:14
      * @author :  姜永辉
      */
-    AccountResponse selectById(@Param("objectId") String objectId);
+    AccountResponse selectById(@Param("id") String id);
 }
 

src/main/java/com/dk/mdm/mapper/mac/AccountMapper.xml

@@ -154,7 +154,7 @@
                t.remarks,
                t.flg_valid,
                t.cp_id,
-               t.receipt - t.receivable as "receivableBalance"
+               t.receivable - t.receipt as "receivableBalance"
         FROM dkic_b.t_mac_account as t
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -199,7 +199,7 @@
                  LEFT JOIN sys.t_data_kind tdk ON tdk.kind_code = t.object_type
                  Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
                  left join dkic_b.t_mst_customer tmc on t.object_id = tmc.cus_id
-        WHERE t.object_id = #{objectId}::uuid
+        WHERE t.object_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_account的一行数据 -->

src/main/java/com/dk/mdm/mapper/mac/OtherPayableItemMapper.xml

@@ -98,7 +98,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_other_payable_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主表主键锁定表t_psi_outbound_item的多行数据 -->

src/main/java/com/dk/mdm/mapper/mac/OtherReceivableItemMapper.xml

@@ -98,7 +98,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_other_receivable_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主表主键锁定表t_psi_outbound_item的多行数据 -->

src/main/java/com/dk/mdm/mapper/mac/OtherReceivableMapper.java

@@ -4,6 +4,7 @@ import com.dk.mdm.model.pojo.mac.OtherReceivable;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mac.OtherReceivableQuery;
 import com.dk.mdm.model.response.mac.OtherReceivableResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -32,6 +33,6 @@ public interface OtherReceivableMapper extends BaseMapper<OtherReceivable>{
      * @author : 付斌
      * @date   : 2024-03-03 9:25
      */
-    OtherReceivableResponse selectById(String id);
+    OtherReceivableResponse selectById(@Param("id") String id);
 }
 

src/main/java/com/dk/mdm/mapper/mac/RecPayHandleItemMapper.xml

@@ -109,7 +109,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_rec_pay_handle_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_rec_pay_handle_item的一行数据 -->
@@ -171,4 +171,9 @@
             )
         </foreach>
     </insert>
+
+    <delete id="deleteById">
+        DELETE FROM dkic_b.t_mac_rec_pay_handle_item
+        WHERE item_id = #{id}::uuid;
+    </delete>
 </mapper>

src/main/java/com/dk/mdm/mapper/mac/RecPayItemMapper.xml

@@ -129,7 +129,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_rec_pay_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_rec_pay_item的一行数据 -->

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.java

@@ -33,7 +33,7 @@ public interface RecPayMapper extends BaseMapper<RecPay>{
      * @author : 付斌
      * @date   : 2024-03-03 9:25
      */
-    RecPayResponse selectById(String id);
+    RecPayResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 根据BiznisId进行查询

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -183,6 +183,12 @@
             OR  t.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
             )
         </if>
+        <if test="staffName != null and staffName != ''">
+            AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+        </if>
+        <if test="orgName != null and orgName != ''">
+            AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
     </sql>
 
     <sql id="idsForeach">

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

@@ -79,7 +79,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_mst_com_menu
-        WHERE menu_uuid = #{menuUuid}::uuid
+        WHERE menu_uuid = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_com_menu的一行数据 -->

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

@@ -292,9 +292,9 @@
         tmo.org_name AS "orgName",
         tms.staff_name AS "staffName",
         tmc.follow_count AS follow_count,
-        tdk1.kind_name_i18n ->> 'zh_CN' AS "follow_status_name",
-        tdk2.kind_name_i18n ->> 'zh_CN' AS intention_name,
-        tdk3.kind_name_i18n ->> 'zh_CN' AS stay_time_len_name
+        tdk1.kind_name_i18n ->>  #{i18n} AS "follow_status_name",
+        tdk2.kind_name_i18n ->>  #{i18n} AS intention_name,
+        tdk3.kind_name_i18n ->>  #{i18n} AS stay_time_len_name
 
         FROM dkic_b.t_crm_cus_follow tccf
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf.cus_id
@@ -323,7 +323,7 @@
         tmc.follow_count AS follow_count,
         tms.staff_name AS follow_staff_name,
         tccf.op_create_time AS create_time,
-        tdk1.kind_name_i18n  ->> 'zh_CN' AS "follow_status_name"
+        tdk1.kind_name_i18n  ->>  #{i18n} AS "follow_status_name"
         FROM dkic_b.t_crm_cus_follow tccf
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf.cus_id
         LEFT JOIN dkic_b.t_mst_org tmo on tmo.org_id = tccf.follow_org
@@ -349,7 +349,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_crm_cus_follow
-        WHERE follow_id = #{followId}::uuid
+        WHERE follow_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_crm_cus_follow的一行数据 -->

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

@@ -75,7 +75,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_crm_cus_follow_staff
-        WHERE cus_id = #{cusId}::uuid
+        WHERE cus_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_crm_cus_follow_staff的一行数据 -->

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

@@ -34,8 +34,8 @@ public interface CustomerMapper extends BaseMapper<Customer>{
      * @author : 于继渤
      * @date : 2022-05-26 14:05
      */
-    Object selectFollowStaffs(@Param("cusId") String cusId);
-    CustomerResponse selectByIdRespone(@Param("cusId") String cusId);
+    Object selectFollowStaffs(@Param("id") String id);
+    CustomerResponse selectByIdRespone(@Param("id") String id);
 
 
     int updateFollowStaffs(Customer customer);

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

@@ -209,7 +209,7 @@
         tmo.org_name  AS  "orgName",
         tms.staff_name  AS  "staffName",
         tms2.staff_name  AS  "reportStaffName",
-        tdk.kind_name_i18n  ->> 'zh_CN' AS "saleStatusName",
+        tdk.kind_name_i18n  ->>  #{i18n} AS "saleStatusName",
         tcf.next_follow_time,
         tma.receivable_residue,
         tma.receipt_residue
@@ -243,7 +243,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_customer
-        WHERE cus_id = #{cusId}::uuid
+        WHERE cus_id = #{id}::uuid
     </select>
 
 
@@ -256,7 +256,7 @@
         tmo.org_name  AS  "orgName",
         tms.staff_name  AS  "staffName",
         tms2.staff_name  AS  "reportStaffName",
-        tdk.kind_name_i18n  ->> 'zh_CN' AS "saleStatusName"
+        tdk.kind_name_i18n  ->>  #{i18n} AS "saleStatusName"
 --         tccfs.follow_staff  as follow_staff,
 --         tms1.staff_name  as follow_staff_name
         FROM dkic_b.t_mst_customer tmc
@@ -268,7 +268,7 @@
         LEFT JOIN  sys.t_data_kind tdk  on tdk.kind_code =  tmc.sale_status
 --         LEFT JOIN  dkic_b.t_crm_cus_follow_staff  tccfs on tccfs.follow_staff = any(tmc.follow_staffs)
 --         LEFT JOIN  dkic_b.t_mst_staff tms1  on tms1.staff_id =  tccfs.follow_staff
-        WHERE tmc.cus_id = #{cusId}::uuid
+        WHERE tmc.cus_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_customer的一行数据 -->
@@ -360,7 +360,7 @@
     <select id="selectFollowStaffs" resultType="Object">
         SELECT follow_staffs
         from dkic_b.t_mst_customer
-        WHERE cus_id = #{cusId}::uuid
+        WHERE cus_id = #{id}::uuid
     </select>
 
 
@@ -370,6 +370,6 @@
         update dkic_b.t_mst_customer
         set
             follow_staffs = null
-        where cus_id = #{cusId}::uuid
+        where cus_id = #{id}::uuid
     </update>
 </mapper>

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

@@ -152,7 +152,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_dictionary_data
-        WHERE data_id = #{dataId}::uuid
+        WHERE data_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_dictionary_data的一行数据 -->

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

@@ -133,7 +133,7 @@
         SELECT
         <include refid="Base_Column_List_Join"/>
         FROM dkic_b.t_mst_goods_brand tmgb
-        WHERE tmgb.brand_id = #{brandId}::uuid
+        WHERE tmgb.brand_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_goods_brand的一行数据 -->

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

@@ -158,7 +158,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_goods_category
-        WHERE cat_id = #{catId}::uuid
+        WHERE cat_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_goods_category的一行数据 -->

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

@@ -124,7 +124,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_goods_series
-        WHERE series_id = #{seriesId}::uuid
+        WHERE series_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_goods_series的一行数据 -->

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

@@ -192,7 +192,7 @@
         LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
         LEFT JOIN dkic_b.t_mst_unit subtmu ON subtmu.unit_id = tmgs.sub_unit_id
         LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
-        WHERE tmgs.sku_id = #{skuId}::uuid
+        WHERE tmgs.sku_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_goods_sku的一行数据 -->

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

@@ -115,7 +115,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_crm_measure_receipt
-        WHERE receipt_id = #{receiptId}::uuid
+        WHERE receipt_id = #{id}::uuid
     </select>
 
     <select id="selectByFollowId" resultMap="BaseResultMap">

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

@@ -115,7 +115,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_crm_measure_room
-        WHERE room_id = #{roomId}::uuid
+        WHERE room_id = #{id}::uuid
     </select>
 
 

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

@@ -105,8 +105,8 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_menu_frequency
-        WHERE menu_uuid = #{menuUuid}::uuid
+        FROM dkic_b.t_mst_menu_frequency
+        WHERE menu_uuid = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_menu_frequency的一行数据 -->

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

@@ -119,7 +119,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_mst_money_account_item
-        WHERE item_id = #{itemId}::uuid
+        WHERE item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_money_account_item的一行数据 -->

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

@@ -16,7 +16,7 @@
             <result column="balance" property="balance"/>
             <result column="display_no" property="displayNo"/>
             <result column="flg_default" property="flgDefault"/>
-            <result column="mac_receipt_code" property="macReceiptCode"/>
+            <result column="mac_receipt_code" property="macReceiptCode" typeHandler="JsonTypeHandler"/>
             <result column="acc_date" property="accDate"/>
             <result column="flg_negative" property="flgNegative"/>
             <result column="remarks" property="remarks"/>
@@ -33,7 +33,7 @@
             <result column="balance" property="balance"/>
             <result column="display_no" property="displayNo"/>
             <result column="flg_default" property="flgDefault"/>
-            <result column="mac_receipt_code" property="macReceiptCode"/>
+            <result column="mac_receipt_code" property="macReceiptCode" typeHandler="JsonTypeHandler"/>
             <result column="acc_date" property="accDate"/>
             <result column="flg_negative" property="flgNegative"/>
             <result column="remarks" property="remarks"/>
@@ -127,7 +127,7 @@
                                                on tmti.trf_id = tmt.trf_id and tmt.flg_valid
                                                    and tmti.flg_valid and tmt.trf_type = 0) tmti
                           on tmti.trf_in_mac = t.mac_id
-        WHERE t.mac_id = #{macId}::uuid
+        WHERE t.mac_id = #{id}::uuid
     </select>
 
     <!-- 王英杰 2024年3月6日 微信小程序用 -->

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

@@ -145,7 +145,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_mst_org_mac
-        WHERE org_id = #{orgId}::uuid
+        WHERE org_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_org_mac的一行数据 -->

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

@@ -4,6 +4,7 @@ import com.dk.mdm.model.pojo.mst.Org;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.common.model.response.mst.OrgResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -20,6 +21,12 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/10 17:20
      */
     List<OrgResponse> selectByCond(OrgQuery orgQuery);
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 姜宁
+     * @date   : 2023/1/10 17:20
+     */
+    List<OrgResponse> selectByCondTree(OrgQuery orgQuery);
 
     /**
      * @desc   : 根据条件进行查询
@@ -34,7 +41,7 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/10 17:20
      */
     Long countByCond(OrgQuery orgQuery);
-    Org  selectById(String orgId);
+    Org  selectById(@Param("id") String id);
     /**
      * @desc : 调用函数生成层级
      * @author : 王英杰

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

@@ -46,6 +46,62 @@
                 orgWh.org_id = parent.org_id
                 ) AS "whName"
     </sql>
+    <sql id="Base_Column_List_viewp">
+        tparent.org_id
+        ,tparent.org_name
+                ,tparent.parent_id
+                ,tparent.display_no
+                ,tparent.top_id
+                ,tparent.level_upper
+                ,tparent.level_lower
+                ,tparent.level_leaf
+                ,tparent.level_no
+                ,tparent.level_code
+                ,tparent.level_name
+                ,tparent.remarks
+                ,tparent.flg_valid
+                ,tparent.cp_id
+                         ,
+                (
+                SELECT
+                string_agg ( ma.mac_name, ',' )
+                FROM
+                dkic_b.t_mst_org_mac AS orgMac
+                left join dkic_b.t_mst_money_account ma on orgMac.mac_id=ma.mac_id
+                WHERE
+                orgMac.org_id = tparent.org_id
+                ) AS "orgMac"
+          ,
+                (
+                SELECT
+                string_agg ( wh.wh_name, ',' )
+                FROM
+                dkic_b.t_mst_org_wh AS orgWh
+                left join dkic_b.t_mst_warehouse wh on wh.wh_id=orgWh.wh_id
+                WHERE
+                orgWh.org_id = tparent.org_id
+                ) AS "whName"
+    </sql>
+    <sql id="Base_Column_List_viewT">
+        T.org_id
+        ,T.org_name
+                ,T.parent_id
+                ,T.display_no
+                ,T.top_id
+                ,T.level_upper
+                ,T.level_lower
+                ,T.level_leaf
+                ,T.level_no
+                ,T.level_code
+                ,T.level_name
+                ,T.remarks
+                ,T.flg_valid
+                ,T.cp_id
+                         ,
+             T.orgMac
+          ,
+              T.whName
+    </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.Org">
@@ -122,6 +178,9 @@
             <if test="flgValidList != null and flgValidList.size>0">
                 AND parent.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
+            <if test="flgValid != null">
+                AND flg_valid = #{flgValid}
+            </if>
             <if test="cpId != null">
                 AND parent.cp_id = #{cpId}
             </if>
@@ -149,7 +208,26 @@
         dkic_b.t_mst_org AS parent
         <include refid="Condition"/>
     </select>
-
+    <!-- 查询表t_mst_org，（条件查询+分页）列表 -->
+    <select id="selectByCondTree" resultMap="BaseResultMapResponse">
+        SELECT    <include refid="Base_Column_List_viewT"/>
+        FROM
+        (--当前数据
+        SELECT
+        <include refid="Base_Column_List_view"/>
+        FROM
+        dkic_b.t_mst_org AS parent
+        <include refid="Condition"/> UNION ALL
+        SELECT
+        <include refid="Base_Column_List_viewp"/>
+        FROM
+        dkic_b.t_mst_org AS parent
+        LEFT JOIN   dkic_b.t_mst_org AS tparent   ON parent.org_id = ANY ( tparent.level_lower )
+        <include refid="Condition"/>
+        ) T
+        GROUP BY
+        <include refid="Base_Column_List_viewT"/>
+    </select>
     <select id="resetLevelOrg" resultType="java.lang.Boolean">
         select dkic_b.f_reset_level_org(#{cpId}, #{topId}::uuid)
     </select>

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

@@ -92,7 +92,7 @@
     <select id="getRoleSensitive" resultType="java.util.Map">
         SELECT
                 tsi.item_code     AS "itemCode",
-                tsi.item_name_i18n ->> 'zh_CN'     AS "itemName",
+                tsi.item_name_i18n ->>  #{i18n}     AS "itemName",
 
             CASE
             WHEN tsi.parent_code = '0' THEN NULL
@@ -110,7 +110,7 @@
                            ON tsi.item_code = tmrs.sen_item_code and tmrs.role_id = #{roleId}::uuid
         WHERE tsi.flg_valid
         <if test="searchText != null">
-            AND (position(#{searchText} in tsi.item_name_i18n ->> 'zh_CN') > 0   OR position(#{searchText} in tsi.item_code) > 0 )
+            AND (position(#{searchText} in tsi.item_name_i18n ->>  #{i18n}) > 0   OR position(#{searchText} in tsi.item_code) > 0 )
         </if>
         ORDER BY tsi.level_code;
     </select>

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

@@ -131,7 +131,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_sale_channel
-        WHERE channel_id = #{channelId}::uuid
+        WHERE channel_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_sale_channel的一行数据 -->

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

@@ -42,14 +42,14 @@ public interface StaffMapper extends BaseMapper<Staff>{
      * @author : 周兴
      * @date   : 2024/3/6 10:42
      */
-    StaffResponse selectByUserId(@Param("userId") String userId);
+    StaffResponse selectByUserId(@Param("id") String id);
 
     /**
      * @desc   : 根据staffId获取当前企业的员工信息
      * @author : 周兴
      * @date   : 2024/3/6 10:42
      */
-    StaffResponse selectById(@Param("staffId") String staffId);
+    StaffResponse selectById(@Param("id") String id);
 
 }
 

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

@@ -137,7 +137,7 @@
             WHERE role_id = ANY (t.role_ids)) AS role_names
         FROM dkic_b.t_mst_staff t
         LEFT JOIN dkic_b.t_mst_org org ON t.org_Id = org.org_Id
-        WHERE t.staff_id = #{staffId}::uuid
+        WHERE t.staff_id = #{id}::uuid
     </select>
 
     <!-- 根据用户Id查询表t_mst_staff的一行数据 -->
@@ -166,7 +166,8 @@
         AND tmow.org_id = T.org_id
         AND tmow.flg_default
         LEFT JOIN dkic_b.t_mst_warehouse tmw ON tmw.wh_id = tmow.wh_id
-        WHERE t.wx_user_id = #{userId}::uuid
+        WHERE t.wx_user_id = #{id}::uuid
+        AND t.cp_id = #{cpId}
     </select>
 
     <!-- 根据用户Id更新dkic_a.t_wx_user的cpid-->

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

@@ -99,7 +99,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_mst_staff_purview
-        WHERE staff_id = #{staffId}::uuid
+        WHERE staff_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_staff_purview的一行数据 -->

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

@@ -92,7 +92,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM t_mst_staff_right
-        WHERE staff_id = #{staffId}::uuid
+        WHERE staff_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_staff_right的一行数据 -->

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

@@ -48,7 +48,7 @@ public interface SupplierMapper extends BaseMapper<Supplier>{
      * @author : 王英杰
      * @date   : 2024/2/29 17:49
      */
-    int   batchDeleteBrand (List<String> supIdList );
+    int   batchDeleteBrand (String supId );
     /**
      * @desc   : 自动生id
      * @author : 王英杰

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

@@ -5,7 +5,10 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        sup_id, sup_code, sup_name, sup_type, contact_name, contact_phone, org_id, staff_id, service_categories, remarks, 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
+        sup_id, sup_code, sup_name, sup_type, contact_name,
+contact_phone, org_id, staff_id, service_categories,
+remarks, 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_address
     </sql>
 <!--    ,taobj.sum_residue-->
     <sql id="msl_Base_Column_List">
@@ -184,11 +187,11 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS  "supTypeName"
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} ) AS  "supTypeName"
           ,
         (
         SELECT
-        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n, 'zh_CN' ), ',' )
+        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n,  #{i18n} ), ',' )
         FROM
         sys.t_data_kind AS tdk1
         WHERE
@@ -230,11 +233,11 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS  "supTypeName"
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} )AS  "supTypeName"
         ,
         (
         SELECT
-        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n, 'zh_CN' ), ',' )
+        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n,  #{i18n}), ',' )
         FROM
         sys.t_data_kind AS tdk1
         WHERE
@@ -261,7 +264,7 @@
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
         LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = msl.sup_type
-        WHERE msl.sup_id = #{supId}::uuid
+        WHERE msl.sup_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_supplier的一行数据 -->

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

@@ -118,7 +118,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM  dkic_b.t_mst_unit
-        WHERE unit_id = #{unitId}::uuid
+        WHERE unit_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_unit的一行数据 -->

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

@@ -141,7 +141,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_warehouse
-        WHERE wh_id = #{whId}::uuid
+        WHERE wh_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_warehouse的一行数据 -->

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

@@ -39,7 +39,7 @@ public interface PurchaseItemMapper extends BaseMapper<PurchaseItem>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    PurchaseItemResponse selectById(@Param("itemId") String itemId);
+    PurchaseItemResponse selectById(@Param("id") String id);
 	
     /**
      * @desc   : 修改金额数量

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

@@ -364,7 +364,7 @@
         left join dkic_b.t_psi_purchase tpp  on tpp.pur_id = tppi.pur_id
         left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tppi.sku_id
         left join  dkic_b.t_mst_goods_brand  tmgb on tmgb.brand_id = tmgs.brand_id
-        WHERE tppi.item_id = #{itemId}::uuid
+        WHERE tppi.item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_purchase_item的一行数据 -->

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

@@ -44,7 +44,7 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
      * @author : 常皓宁
      * @date   : 2024/3/2 11:39
      */
-    PurchaseResponse  selectById(@Param("purId") String purId);
+    PurchaseResponse  selectById(@Param("id") String id);
 
     /**
      * @desc   : 采购订单 待入库查询

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

@@ -392,6 +392,10 @@
             <if test="makeTime != null">
                 AND tpp.make_time = #{makeTime}
             </if>
+            <if test="makeTimeStart != null and makeTimeEnd != null">
+                AND tpp.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpp.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+            </if>
             <if test="flgValid != null">
                 AND tpp.flg_valid = #{flgValid}
             </if>
@@ -480,7 +484,7 @@
         left join sys.t_data_kind tdk1 on tdk1.kind_code = tpp.into_status
         left join sys.t_data_kind tdk2 on tdk2.kind_code = tpp.pur_status
         <include refid="Condition_1"/>
-            order by  tpp.op_create_time desc
+            order by  tpp.make_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -574,7 +578,7 @@
         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
+        WHERE pur_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表dkic_b.t_psi_purchase的一行数据 -->

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -79,4 +79,19 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      * @date   : 2024/4/11 16:56
      */
     List<Map<String, Object>> getInboundDetailReport(Map param);
+
+    /**
+     * @desc   : 客户收款明细表（主表）
+     * @author : 宋扬
+     * @date   : 2024/4/16 11:30
+     */
+    List<Map<String, Object>> getRecPayDetailReport(Map param);
+
+    /**
+     * @desc   : 销售跟踪表 列表查询
+     * @author : 于继渤
+     * @date   : 2024/4/16 11:27
+     */
+    List<Map<String, Object>> getSalesTrackingReport(Map param);
+    Long getSalesTrackingReportCount(Map<String, Object> param);
 }

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -69,6 +69,12 @@
             <if test="purNo != null and purNo != ''">
                 AND tpp.pur_no like concat('%', my_ex.likequery(#{purNo}) , '%')
             </if>
+            <if test="purTypeList != null and purTypeList.size()>0">
+                AND tpp.pur_type =any(#{purTypeList,typeHandler=StringListTypeHandler})
+            </if>
+            <if test="purStatusList != null and purStatusList.size()>0">
+                AND tpp.pur_status =any(#{purStatusList,typeHandler=StringListTypeHandler})
+            </if>
             <if test="supIdlist != null and supIdlist.size()>0">
                 AND tpp.sup_id = any(#{supIdlist,typeHandler=UuidListTypeHandler})
             </if>
@@ -125,6 +131,12 @@
             <if test="purNo != null and purNo != ''">
                 AND tpp.pur_no like concat('%', my_ex.likequery(#{purNo}) , '%')
             </if>
+            <if test="purTypeList != null and purTypeList.size()>0">
+                AND tpp.pur_type =any(#{purTypeList,typeHandler=StringListTypeHandler})
+            </if>
+            <if test="purStatusList != null and purStatusList.size()>0">
+                AND tpp.pur_status =any(#{purStatusList,typeHandler=StringListTypeHandler})
+            </if>
             <if test="supIdlist != null and supIdlist.size()>0">
                 AND tpp.sup_id = any(#{supIdlist,typeHandler=UuidListTypeHandler})
             </if>
@@ -163,6 +175,9 @@
             <if test="orderNo != null and orderNo != ''">
                 AND t.order_no LIKE concat('%',my_ex.likequery(#{orderNo}),'%')
             </if>
+            <if test="ordTypeList != null and ordTypeList.size()>0">
+                AND t.ord_type =any(#{ordTypeList,typeHandler=StringListTypeHandler})
+            </if>
             <if test="addressFull != null and addressFull != ''">
                 AND t.address_full LIKE concat('%',my_ex.likequery(#{addressFull}),'%')
             </if>
@@ -190,8 +205,8 @@
             <if test="staffIdList != null and staffIdList.size() > 0">
                 AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
             </if>
-            <if test="outStatusList != null and outStatusList.size() > 0">
-                AND t.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
+            <if test="ordStatusList != null and ordStatusList.size() > 0">
+                AND t.ord_status  =any(#{ordStatusList, typeHandler=StringListTypeHandler})
             </if>
             <if test="deliveryDateStart != null and deliveryDateEnd != null">
                 AND t.delivery_date &gt;= #{deliveryDateStart}::timestamp with time zone
@@ -232,6 +247,12 @@
             <if test="orderNo != null and orderNo != ''">
                 AND t.order_no LIKE concat('%',my_ex.likequery(#{orderNo}),'%')
             </if>
+            <if test="ordTypeList != null and ordTypeList.size()>0">
+                AND t.ord_type =any(#{ordTypeList,typeHandler=StringListTypeHandler})
+            </if>
+            <if test="ordStatusList != null and ordStatusList.size() > 0">
+                AND t.ord_status  =any(#{ordStatusList, typeHandler=StringListTypeHandler})
+            </if>
             <if test="addressFull != null and addressFull != ''">
                 AND t.address_full LIKE concat('%',my_ex.likequery(#{addressFull}),'%')
             </if>
@@ -259,9 +280,6 @@
             <if test="staffIdList != null and staffIdList.size() > 0">
                 AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
             </if>
-            <if test="outStatusList != null and outStatusList.size() > 0">
-                AND t.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
-            </if>
             <if test="deliveryDateStart != null and deliveryDateEnd != null">
                 AND t.delivery_date &gt;= #{deliveryDateStart}::timestamp with time zone
                 AND t.delivery_date &lt; #{deliveryDateEnd}::timestamp with time zone + interval '1 day'
@@ -389,8 +407,8 @@
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
-            <if test="outNo != null and outNo != ''">
-                AND t.out_no LIKE concat('%',my_ex.likequery(#{outNo}),'%')
+            <if test="intoNo != null and intoNo != ''">
+                AND t.into_no LIKE concat('%',my_ex.likequery(#{outNo}),'%')
             </if>
             <if test="supIdlist != null and supIdlist.size()>0">
                 AND t.sup_id = any(#{supIdlist,typeHandler=UuidListTypeHandler})
@@ -398,8 +416,8 @@
             <if test="contactPhone != null and contactPhone != ''">
                 AND t.contact_phone LIKE concat('%',my_ex.likequery(#{contactPhone}),'%')
             </if>
-            <if test="outTypeList != null and outTypeList.size()>0">
-                AND t.out_type =any(#{outTypeList,typeHandler=StringListTypeHandler})
+            <if test="intoTypeList != null and intoTypeList.size()>0">
+                AND t.into_type =any(#{intoTypeList,typeHandler=StringListTypeHandler})
             </if>
             <if test="fromNo != null and fromNo != ''">
                 AND t.from_no LIKE concat('%',my_ex.likequery(#{fromNo}),'%')
@@ -413,12 +431,12 @@
             <if test="staffIdList != null and staffIdList.size() > 0">
                 AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
             </if>
-            <if test="outStatusList != null and outStatusList.size() > 0">
-                AND t.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
+            <if test="intoStatusList != null and intoStatusList.size() > 0">
+                AND t.into_status  =any(#{intoStatusList, typeHandler=StringListTypeHandler})
             </if>
-            <if test="outDateStart != null and outDateEnd != null">
-                AND t.out_date &gt;= #{outDateStart}::timestamp with time zone
-                AND t.out_date &lt; #{outDateEnd}::timestamp with time zone + interval '1 day'
+            <if test="intoDateStart != null and intoDateEnd != null">
+                AND t.into_date &gt;= #{intoDateStart}::timestamp with time zone
+                AND t.into_date &lt; #{intoDateEnd}::timestamp with time zone + interval '1 day'
             </if>
             <if test="makeTimeStart != null and makeTimeEnd != null">
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
@@ -455,8 +473,8 @@
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
-            <if test="outNo != null and outNo != ''">
-                AND t.out_no LIKE concat('%',my_ex.likequery(#{outNo}),'%')
+            <if test="intoNo != null and intoNo != ''">
+                AND t.into_no LIKE concat('%',my_ex.likequery(#{outNo}),'%')
             </if>
             <if test="supIdlist != null and supIdlist.size()>0">
                 AND t.sup_id = any(#{supIdlist,typeHandler=UuidListTypeHandler})
@@ -464,8 +482,8 @@
             <if test="contactPhone != null and contactPhone != ''">
                 AND t.contact_phone LIKE concat('%',my_ex.likequery(#{contactPhone}),'%')
             </if>
-            <if test="outTypeList != null and outTypeList.size()>0">
-                AND t.out_type =any(#{outTypeList,typeHandler=StringListTypeHandler})
+            <if test="intoTypeList != null and intoTypeList.size()>0">
+                AND t.into_type =any(#{intoTypeList,typeHandler=StringListTypeHandler})
             </if>
             <if test="fromNo != null and fromNo != ''">
                 AND t.from_no LIKE concat('%',my_ex.likequery(#{fromNo}),'%')
@@ -479,12 +497,48 @@
             <if test="staffIdList != null and staffIdList.size() > 0">
                 AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
             </if>
-            <if test="outStatusList != null and outStatusList.size() > 0">
-                AND t.out_status  =any(#{outStatusList, typeHandler=StringListTypeHandler})
+            <if test="intoStatusList != null and intoStatusList.size() > 0">
+                AND t.into_status  =any(#{intoStatusList, typeHandler=StringListTypeHandler})
             </if>
-            <if test="outDateStart != null and outDateEnd != null">
-                AND t.out_date &gt;= #{outDateStart}::timestamp with time zone
-                AND t.out_date &lt; #{outDateEnd}::timestamp with time zone + interval '1 day'
+            <if test="intoDateStart != null and intoDateEnd != null">
+                AND t.into_date &gt;= #{intoDateStart}::timestamp with time zone
+                AND t.into_date &lt; #{intoDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
+            <if test="makeTimeStart != null and makeTimeEnd != null">
+                AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+            </if>
+        </where>
+    </sql>
+
+    <!-- 客户收款明细表条件列 -->
+    <sql id="Condition_RecPayDetailReport">
+        <where>
+            t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
+            <if test="cpId != null">
+                AND t.cp_id = #{cpId}
+            </if>
+            <if test="rpNo != null and rpNo != ''">
+                AND t.rp_no LIKE concat('%',my_ex.likequery(#{rpNo}),'%')
+            </if>
+            <if test="contactPhone != null and contactPhone != ''">
+                AND t.contact_phone LIKE concat('%',my_ex.likequery(#{contactPhone}),'%')
+            </if>
+            <if test="biznisNo != null and biznisNo != ''">
+                AND t.biznis_no LIKE concat('%',my_ex.likequery(#{biznisNo}),'%')
+            </if>
+            <if test="cusName != null and cusName != ''">
+                AND tmc.cus_name LIKE concat('%',my_ex.likequery(#{cusName}),'%')
+            </if>
+            <if test="orgIdList != null and orgIdList.size() > 0">
+                AND t.org_id  =any(#{orgIdList, typeHandler=uuidListTypeHandler})
+            </if>
+            <if test="staffIdList != null and staffIdList.size() > 0">
+                AND t.staff_id  =any(#{staffIdList, typeHandler=uuidListTypeHandler})
+            </if>
+            <if test="accDateStart != null and accDateEnd != null">
+                AND t.acc_date &gt;= #{accDateStart}::timestamp with time zone
+                AND t.acc_date &lt; #{accDateEnd}::timestamp with time zone + interval '1 day'
             </if>
             <if test="makeTimeStart != null and makeTimeEnd != null">
                 AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
@@ -503,6 +557,7 @@
         ,tmp.sup_name as "supplierName"
         ,tpp.pickup_date as "pickupDate"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "purStatusName"
+        ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
         ,tpp.contact_name as "contactName"
         ,tpp.contact_phone as "contactPhone"
         ,tpp.intoing_qty as "intoingQtySum"
@@ -521,6 +576,7 @@
         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
         left join sys.t_data_kind tdk2 on tdk2.kind_code = tpp.pur_status
+        left join sys.t_data_kind tdk1 on tdk1.kind_code = tpp.pur_type
         <include refid="Condition_PurReport"/>
         order by  tpp.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -538,6 +594,7 @@
         ,tmp.sup_name as "supplierName"
         ,tpp.pickup_date as "pickupDate"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "purStatusName"
+        ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
         ,tpp.contact_name as "contactName"
         ,tpp.contact_phone as "contactPhone"
         ,tpp.intoing_qty as "intoingQtySum"
@@ -574,6 +631,7 @@
         Left join dkic_b.t_mst_staff as tms1  on tpp.make_staff = tms1.staff_id
         Left join dkic_b.t_mst_warehouse as tmw on tpp.wh_id = tmw.wh_id
         left join sys.t_data_kind as tdk2 on tdk2.kind_code = tpp.pur_status
+        left join sys.t_data_kind tdk1 on tdk1.kind_code = tpp.pur_type
         left join dkic_b.t_psi_purchase_item as tppi on tppi.pur_id = tpp.pur_id
         left join dkic_b.t_mst_goods_sku as tmgs on tmgs.sku_id = tppi.sku_id
         left join dkic_b.t_mst_goods_brand as tmgb on tmgb.brand_id = tmgs.brand_id
@@ -905,4 +963,95 @@
         </if>
     </select>
 
+    <!-- 客户收款明细报表主表 -->
+    <select id="getRecPayDetailReport" resultType="java.util.Map">
+        SELECT
+        t.rp_no                                             as "rpNo",
+        t.biznis_no                                         as "biznisNo",
+        tmo.org_name                                        as "orgName",
+        tms.staff_name                                      as "staffName",
+        tmc.cus_name                                        as "cusName",
+        tmc.cus_phone                                       as "cusPhone",
+        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n})   as "rpTypeName",
+        tmma.mac_name                                       as "macName",
+        tmrpi.amt_rec                                           as "amtRec",
+        t.acc_date                                          as "accDate",
+        t.remarks,
+        makestaff.staff_name                                as "makeStaffName"
+        FROM dkic_b.t_mac_rec_pay_item as tmrpi
+        left join dkic_b.t_mac_rec_pay t on tmrpi.rp_id = t.rp_id
+        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
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_money_account tmma on tmma.mac_id = tmrpi.mac_id
+        <include refid="Condition_RecPayDetailReport"/>
+        order by  t.op_create_time desc
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+
+
+    <sql id="ConditionSalesTrackingReport">
+        <where>
+            <if test="cpId != null">
+                tpo.cp_id = #{cpId}
+            </if>
+        </where>
+    </sql>
+
+
+    <!--  销售跟踪表 列表查询 -->
+    <select id="getSalesTrackingReport" resultType="java.util.Map">
+        SELECT
+            tpo.order_id AS "orderId"
+             ,tpo.order_no AS "orderNo"
+             ,tpo.order_type AS "orderType"
+             ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) AS "orderTypeName"
+             ,tpo.sum_quantity AS "sumQuantity"
+             ,tpo.sum_amount AS "sumAmount"
+             ,tpo.sum_standard AS "sumStandard"
+             ,tpo.sale_discount AS "saleDiscount"
+             ,tpo.order_status AS "orderStatus"
+             ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "orderStatusName"
+             ,tpo.out_status AS "outStatus"
+             ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "outStatusName"
+             ,tpo.outing_qty AS "outingQty"
+             ,tpo.outing_amt AS "outingAmt"
+             ,tpo.out_qty AS "outQty"
+             ,tpo.out_amt AS "outAmt"
+             ,tpo.return_qty AS "returnQty"
+             ,tpo.return_amt AS "returnAmt"
+             ,tpo.amt_receivable AS "amtReceivable"
+             ,tpo.amt_handle AS "amtHandle"
+             ,tpo.amt_residue AS "amtResidue"
+             ,tpo.make_time AS "makeTime"
+            ,tmc.cus_code AS "cusCode"
+            ,tmc.cus_name  As "cusName"
+            ,tmc.cus_phone  As "cusPhone"
+        FROM
+            dkic_b.t_psi_order tpo
+        left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_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="ConditionSalesTrackingReport"/>
+        order by  tpo.op_create_time desc
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+
+
+    <select id="getSalesTrackingReportCount" resultType="java.lang.Long">
+        SELECT count(1)
+        FROM
+            dkic_b.t_psi_order tpo
+        <include refid="ConditionSalesTrackingReport"/>
+    </select>
+
 </mapper>

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

@@ -75,7 +75,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_psi_multi_owner
-        WHERE multi_id = #{multiId}::uuid
+        WHERE multi_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_multi_owner的一行数据 -->

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.java

@@ -64,7 +64,7 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
      * @date   : 2024/3/19 15:01
      * @author : 寇珊珊
      */
-    OrderItemResponse selectById(@Param("itemId") String itemId);
+    OrderItemResponse selectById(@Param("id") String id);
 
     /**
      * @desc   : 修改退货信息

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

@@ -192,7 +192,7 @@
         SELECT
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_order_item t
-        WHERE t.item_id = #{itemId}::uuid
+        WHERE t.item_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_order_item的一行数据 -->

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

@@ -679,7 +679,7 @@
                  left join sys.t_data_kind as tdk1 on t.order_type = tdk1.kind_code
                  left join sys.t_data_kind as tdk2 on t.order_status = tdk2.kind_code
                  left join sys.t_data_kind as tdk3 on t.out_status = tdk3.kind_code
-        WHERE t.order_id = #{orderId}::uuid
+        WHERE t.order_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_order的一行数据 -->

src/main/java/com/dk/mdm/mapper/sys/BarcodeItemMapper.xml

@@ -98,9 +98,9 @@
     </select>
     
     <select id="selectByKind" resultType="Map">
-        SELECT sys.f_get_name_i18n_lang(stbi.item_name_i18n, 'zh_CN') as            "itemName",
+        SELECT sys.f_get_name_i18n_lang(stbi.item_name_i18n,  #{i18n}) as            "itemName",
                stbi.item_code                                                       "itemCode",
-               sys.f_get_name_i18n_lang(tdk2.kind_name_i18n, 'zh_CN')               "formatKindName",
+               sys.f_get_name_i18n_lang(tdk2.kind_name_i18n,  #{i18n})               "formatKindName",
                stbi.sample_text                                                     "sampleText",
                stbi.flg_valid                                                       "flgValid",
                coalesce(mtbs2.FIX_LEN, text(stbi.def_format ->> 'FIX_LEN'))         "fixLen",

src/main/java/com/dk/mdm/mapper/sys/DictionaryItemMapper.xml

@@ -63,7 +63,7 @@
                 AND remarks = #{remarks}
             </if>
             <if test="textValue != null and textValue != ''">
-                AND item_name_i18n ->> 'zh_CN' like concat('%', #{textValue}, '%')
+                AND item_name_i18n ->>  #{i18n} like concat('%', #{textValue}, '%')
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/mapper/sys/PageItemMapper.xml

@@ -144,7 +144,7 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM sys.t_s_page_item
-        WHERE item_uuid = #{itemUuid}::uuid
+        WHERE item_uuid = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_s_page_item的一行数据 -->

src/main/java/com/dk/mdm/mapper/wxapi/basic/WxCommonMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.dk.mdm.mapper.wxapi.basic.WxCommonMapper">
     <!-- 获取系统基础数据 -->
     <select id="getBasicData" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
-        select bd.data_code as "code", sys.f_get_name_i18n('zh_CN', bd.data_name_i18n) as "name"
+        select bd.data_code as "code", sys.f_get_name_i18n( #{i18n}, bd.data_name_i18n) as "name"
         from sys.t_s_basic_data bd
         where bd.flg_valid
           and bd.type_code = #{dataSourceCode}
@@ -60,7 +60,7 @@
     <select id="getSettlement" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
         select tmst.type_id                                      as id,
                tmst.type_name                                    as name,
-               sys.f_get_name_i18n('zh_CN', tsbd.data_name_i18n) as accountname
+               sys.f_get_name_i18n( #{i18n}, tsbd.data_name_i18n) as accountname
         from sale.t_m_settlement_type tmst
                  LEFT JOIN sys.t_s_basic_data tsbd ON tsbd.flg_valid AND tsbd.data_code = tmst.account_type
         where tmst.flg_valid
@@ -102,7 +102,7 @@
         select tpt.purview_name_i18n as purviewName,
                tpt.purview_code as "code",
                "row_number"() OVER (ORDER BY tpt.display_no) as "id",
-                sys.f_get_name_i18n(tpt.purview_name_i18n,'zh_CN') AS name
+                sys.f_get_name_i18n(tpt.purview_name_i18n, #{i18n}) AS name
         from sys.t_purview_type tpt
         where tpt.flg_valid
         order by tpt.display_no
@@ -232,7 +232,7 @@
     </select>
 
     <select id="getOrderStatus" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
-        select sys.f_get_name_i18n('zh_CN', tsb.data_name_i18n) AS name, tsb.data_code as code
+        select sys.f_get_name_i18n( #{i18n}, tsb.data_name_i18n) AS name, tsb.data_code as code
         from sys.t_s_basic_data tsb
         where tsb.flg_valid
           and tsb.type_code = '审'
@@ -320,7 +320,7 @@
 
 
     <select id="getReceptionStatus" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
-        select sys.f_get_name_i18n('zh_CN', tsb.data_name_i18n) AS name, tsb.data_code as code
+        select sys.f_get_name_i18n( #{i18n}, tsb.data_name_i18n) AS name, tsb.data_code as code
         from sys.t_s_basic_data tsb
         where tsb.flg_valid
           and tsb.type_code = '跟进方式'
@@ -328,7 +328,7 @@
     </select>
 <!--获取供应商类别-->
     <select id="getSupplierType" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
-        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS name, tdk.kind_code as code
+        select sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} )AS name, tdk.kind_code as code
         from sys.t_data_kind tdk
         where tdk.flg_valid
           and tdk.kind_type = '供应商类别'
@@ -337,7 +337,7 @@
 
     <!--获取服务类别-->
     <select id="getServiceCategories" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
-        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS name, tdk.kind_code as code
+        select sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) AS name, tdk.kind_code as code
         from sys.t_data_kind tdk
         where tdk.flg_valid
           and tdk.kind_type = '服务类别'

src/main/java/com/dk/mdm/model/pojo/mac/AccountItem.java

@@ -171,6 +171,14 @@ public class AccountItem extends PageInfo<AccountItem> implements Serializable {
 
 
     /**
+     * 锁定标识 (开单收款，自动锁定)
+     */
+    @Excel(name = "锁定标识 (开单收款，自动锁定)")
+    @ApiModelProperty(value = "锁定标识 (开单收款，自动锁定)")
+    private Boolean flgLock;
+
+
+    /**
      * 备注
      */
     @Excel(name = "备注")

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.pojo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -98,7 +99,9 @@ public class MoneyAccount extends PageInfo<MoneyAccount> implements Serializable
      */
     @Excel(name = "收款码 (图片路径)")
     @ApiModelProperty(value = "收款码 (图片路径)")
-    private String macReceiptCode;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
+
 
 
     /**

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

@@ -235,7 +235,7 @@ public class Supplier extends PageInfo<Supplier> implements Serializable {
     @ApiModelProperty(value = "供应品牌")
     private List<String> brandIds;
 
-    @TableField(exist = false)
+
     @ApiModelProperty(value = "退货地址")
     private String returnAddress;
     /*

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

@@ -1,5 +1,6 @@
 package com.dk.mdm.model.query.ivt;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
@@ -10,6 +11,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -270,6 +272,26 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sPurItemId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class,exist = false)
+    private LocalDate intoDateStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class,exist = false)
+    private LocalDate  intoDateEnd;
+
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+    @Excel(name = "供应商")
+    @ApiModelProperty(value = "供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/query/mac/AccountItemQuery.java

@@ -173,6 +173,14 @@ public class AccountItemQuery extends PageInfo<AccountItemQuery> implements Seri
 
 
     /**
+     * 锁定标识 (开单收款，自动锁定)
+     */
+    @Excel(name = "锁定标识 (开单收款，自动锁定)")
+    @ApiModelProperty(value = "锁定标识 (开单收款，自动锁定)")
+    private Boolean flgLock;
+
+
+    /**
      * 备注
      */
     @Excel(name = "备注")
@@ -242,6 +250,8 @@ public class AccountItemQuery extends PageInfo<AccountItemQuery> implements Seri
     @ApiModelProperty(value = "功能入口类型：add/refund")
     private String formType;
 
+    @ApiModelProperty(value = "订单Id")
+    private String orderId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -265,6 +265,12 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String supName;
 
+    @ApiModelProperty(value = "部门名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)

src/main/java/com/dk/mdm/model/query/mst/MoneyAccountQuery.java

@@ -1,9 +1,11 @@
 package com.dk.mdm.model.query.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -101,7 +103,8 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
      */
     @Excel(name = "收款码 (图片路径)")
     @ApiModelProperty(value = "收款码 (图片路径)")
-    private String macReceiptCode;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
 
 
     /**

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

@@ -72,7 +72,13 @@ public class PurchaseQuery extends PageInfo<PurchaseQuery> implements Serializab
     @ApiModelProperty(value = "订单类型 (【系统字典】采购订单)")
     private String purType;
 
+    @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;
     /**
      * 部门
      */

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -391,6 +391,27 @@ public class InboundItemResponse  {
 
     @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
     private Boolean addOrEditFlag;
+    /**
+     * 入库单号
+     */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+    /**
+     * 供应商编号
+     */
+    @Excel(name = "供应商编号")
+    @ApiModelProperty(value = "供应商编号")
+    private String supCode;
+
+
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称")
+    @ApiModelProperty(value = "供应商名称")
+    private String supName;
 
 
 

src/main/java/com/dk/mdm/model/response/mac/AccountItemResponse.java

@@ -173,6 +173,14 @@ public class AccountItemResponse extends PageInfo<AccountItemResponse> implement
 
 
     /**
+     * 锁定标识 (开单收款，自动锁定)
+     */
+    @Excel(name = "锁定标识 (开单收款，自动锁定)")
+    @ApiModelProperty(value = "锁定标识 (开单收款，自动锁定)")
+    private Boolean flgLock;
+
+
+    /**
      * 备注
      */
     @Excel(name = "备注")

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

@@ -1,9 +1,11 @@
 package com.dk.mdm.model.response.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -95,12 +97,14 @@ public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> impleme
     private Boolean flgDefault;
 
 
+
     /**
      * 收款码 (图片路径)
      */
     @Excel(name = "收款码 (图片路径)")
     @ApiModelProperty(value = "收款码 (图片路径)")
-    private String macReceiptCode;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
 
 
     /**

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

@@ -1,9 +1,11 @@
 package com.dk.mdm.model.vo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -101,7 +103,8 @@ public class MoneyAccountVO extends PageInfo<MoneyAccountVO> implements Serializ
      */
     @Excel(name = "收款码 (图片路径)")
     @ApiModelProperty(value = "收款码 (图片路径)")
-    private String macReceiptCode;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
 
 
     /**

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

@@ -12,19 +12,18 @@ import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.ivt.TransferConvert;
 import com.dk.mdm.infrastructure.convert.ivt.TransferItemConvert;
 import com.dk.mdm.mapper.ivt.InboundItemMapper;
+import com.dk.mdm.mapper.ivt.OutboundItemMapper;
 import com.dk.mdm.mapper.ivt.TransferItemMapper;
-import com.dk.mdm.model.pojo.ivt.CheckItem;
-import com.dk.mdm.model.pojo.ivt.InboundItem;
-import com.dk.mdm.model.pojo.ivt.Transfer;
+import com.dk.mdm.model.pojo.ivt.*;
 import com.dk.mdm.mapper.ivt.TransferMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.ivt.TransferItem;
 import com.dk.mdm.model.pojo.mac.RecPay;
 import com.dk.mdm.model.pojo.mac.RecPayItem;
 import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.mdm.model.query.ivt.TransferQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import com.dk.mdm.model.response.ivt.TransferResponse;
 import com.dk.mdm.model.vo.ivt.*;
 import com.dk.mdm.service.common.CommonService;
@@ -78,6 +77,9 @@ public class TransferService extends BaseService<Transfer> {
 	@Autowired
 	private InboundItemMapper inboundItemMapper;
 
+    @Autowired
+    private OutboundItemMapper outboundItemMapper;
+
 
 	/**
 	 * @desc   : 重写主键
@@ -145,7 +147,7 @@ public class TransferService extends BaseService<Transfer> {
 						.setScale(6, BigDecimal.ROUND_HALF_UP);*/
 				// 获取入库表实体
 				InboundVO inboundVO = new InboundVO();
-				List<InboundItem> inboundItemList=new ArrayList<>();
+				List<InboundItemVO> inboundItemVOList=new ArrayList<>();
 				// 获取出库表实体
 				OutboundVO outboundVO = new OutboundVO();
 				List<OutboundItemVO> outboundItemVOList=new ArrayList<>();
@@ -167,28 +169,46 @@ public class TransferService extends BaseService<Transfer> {
 					// 获取入库明细实体
 					for (TransferItemVO transferItemVO : transferVO.getItemList()) {
 						// 赋值入库明细实体
-						InboundItem inboundItem=new InboundItem();
-						inboundItem.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
-								.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO).setIntoId(transferItemVO.getInvId())
-								.setWhId(transferItemVO.getWhId()).setSkuId(transferItemVO.getSkuId())
-								.setNonStdCode(transferItemVO.getONonStdCode()).setItemIndex(transferItemVO.getItemIndex());
-						inboundItemList.add(inboundItem);
+						InboundItemVO inboundItemVO=new InboundItemVO();
+                        inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+                                .setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+								.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO)
+                                .setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
+
+                        inboundItemVOList.add(inboundItemVO);
+
+                        // 赋值出库明细信息。
+                        OutboundItemVO outboundItemVO =new OutboundItemVO();
+                        outboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+                                .setOutingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+                                .setOutingAmt(BigDecimal.ZERO).setPriceOut(BigDecimal.ZERO)
+                                .setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
+
+                        outboundItemVOList.add(outboundItemVO);
 					}
+
+                    // 赋值出库接口参数 总表和明细
+                    outboundCheckMap.put("total",outboundVO);
+                    outboundCheckMap.put("detail",outboundItemVOList);
+                    // 调用盘点出库接口
+                    OutboundVO outboundTransferVO = outboundCheckService.otherOutboundInsert(outboundCheckMap);
+
 					// 赋值入库接口参数 总表和明细
 					inboundMap.put("total", inboundVO);
-					inboundMap.put("detail", inboundItemList);
+					inboundMap.put("detail", inboundItemVOList);
 					// 调用入库接口
 					InboundVO inboundTransferVO = inboundCheckService.checkInboundInsert(inboundMap);
 					// 如果库存接口返回成功，则插入调整单明细数据
 					if (transferVO.getItemList() != null && transferVO.getItemList().size() > 0) {
 						for (TransferItemVO transferItemVO : transferVO.getItemList()) {
-							// 转换
+							// 转换库存调整单明细
 							TransferItem transferItem = transferItemConvert.convertToPo(transferItemVO);
 							// 在入库接口中获取入库明细数据
-							List<InboundItemVO> inboundItemVOList = inboundTransferVO.getItemList().stream()
+							inboundItemVOList = inboundTransferVO.getItemList().stream()
 									.filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
 							// 通过入库明细数据的item_id查询出inv_id
 							InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVOList.get(0).getItemId());
+
 							// 获取调整主表uuid
 							transferItem.setTransferId(transfer.getTransferId()).setTransferDate(LocalDate.now())
 									.setInvId(inboundItemResponse.getInvId());
@@ -198,19 +218,18 @@ public class TransferService extends BaseService<Transfer> {
 							InboundItem inboundItem= new InboundItem();
 							inboundItem.setFromItemId(transferItem.getItemId()).setItemId(inboundItemResponse.getItemId());
 							inboundItemService.updateByUuid(inboundItem);
-							// 赋值出库明细信息。
-							OutboundItemVO outboundItemVO =new OutboundItemVO();
-							outboundItemVO.setFromItemId(transferItem.getItemId()).setItemIndex(transferItem.getItemIndex())
-									.setOutingQty(transferItem.getTransferQty()).setFromId(transferItem.getTransferId())
-									.setSkuId(transferItem.getSkuId()).setNonStdCode(transferItem.getONonStdCode())
-									.setInvId(transferItem.getOInvId()).setPriceOut(BigDecimal.ZERO).setOutingAmt(BigDecimal.ZERO);
-							outboundItemVOList.add(outboundItemVO);
+
+                            // 在出库接口中获取入库明细数据
+                            outboundItemVOList = outboundTransferVO.getItemList().stream()
+                                    .filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
+                            // 通过出库明细数据的item_id查询出inv_id
+                            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectById(outboundItemVOList.get(0).getItemId());
+
+                            // 赋值出库明细值 并修改出库明细from_item_id值
+                            OutboundItem outboundItem= new OutboundItem();
+                            outboundItem.setFromItemId(transferItem.getItemId()).setItemId(outboundItemResponse.getItemId());
+                            inboundItemService.updateByUuid(inboundItem);
 						}
-						// 赋值出库接口参数 总表和明细
-						outboundCheckMap.put("total",outboundVO);
-						outboundCheckMap.put("detail",outboundItemVOList);
-						// 调用盘点出库接口
-						outboundCheckService.otherOutboundInsert(outboundCheckMap);
 					}
 				}
 				// 非标号调整
@@ -231,50 +250,60 @@ public class TransferService extends BaseService<Transfer> {
 					// 获取入库明细实体
 					for (TransferItemVO transferItemVO : transferVO.getItemList()) {
 						// 赋值入库明细实体
-						InboundItem inboundItem=new InboundItem();
-						inboundItem.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
-								.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO).setIntoId(transferItemVO.getInvId())
-								.setWhId(transferItemVO.getOWhId()).setSkuId(transferItemVO.getSkuId())
-								.setNonStdCode(transferItemVO.getNonStdCode()).setItemIndex(transferItemVO.getItemIndex());
-						inboundItemList.add(inboundItem);
+                        InboundItemVO inboundItemVO=new InboundItemVO();
+                        inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+                                .setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+								.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO)
+								.setWhId(transferItemVO.getOWhId()).setNonStdCode(transferItemVO.getNonStdCode());
+                        inboundItemVOList.add(inboundItemVO);
+
+                        // 赋值出库明细信息。
+                        OutboundItemVO outboundItemVO =new OutboundItemVO();
+                        outboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+                                .setOutingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+                                .setOutingAmt(BigDecimal.ZERO).setPriceOut(BigDecimal.ZERO)
+                                .setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
+                        outboundItemVOList.add(outboundItemVO);
 					}
+                    // 赋值出库接口参数 总表和明细
+                    outboundCheckMap.put("total",outboundVO);
+                    outboundCheckMap.put("detail",outboundItemVOList);
+                    // 调用盘点出库接口
+                    OutboundVO outboundTransferVO = outboundCheckService.otherOutboundInsert(outboundCheckMap);
+
 					// 赋值入库接口参数 总表和明细
 					inboundMap.put("total", inboundVO);
-					inboundMap.put("detail", inboundItemList);
+					inboundMap.put("detail", inboundItemVOList);
 					// 调用入库接口
 					InboundVO inboundTransferVO = inboundCheckService.checkInboundInsert(inboundMap);
 					// 如果库存接口返回成功，则插入调整单明细数据
 					if (transferVO.getItemList() != null && transferVO.getItemList().size() > 0) {
 						for (TransferItemVO transferItemVO : transferVO.getItemList()) {
-							// 转换
+                            // 转换库存调整单明细
 							TransferItem transferItem = transferItemConvert.convertToPo(transferItemVO);
-							// 在入库接口中获取入库明细数据
-							List<InboundItemVO> inboundItemVOList = inboundTransferVO.getItemList().stream()
-									.filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
-							// 通过入库明细数据的item_id查询出inv_id
-							InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVOList.get(0).getItemId());
-							// 获取调整主表uuid
-							transferItem.setTransferId(transfer.getTransferId()).setTransferDate(LocalDate.now())
-									.setInvId(inboundItemResponse.getInvId());
-							// 插入调整单明细数据
-							transferItemMapper.insert(transferItem);
-							// 赋值入库明细值 并修改入库明细from_item_id值
-							InboundItem inboundItem= new InboundItem();
-							inboundItem.setFromItemId(transferItem.getItemId()).setItemId(inboundItemResponse.getItemId());
-							inboundItemService.updateByUuid(inboundItem);
-							// 赋值出库明细信息。
-							OutboundItemVO outboundItemVO =new OutboundItemVO();
-							outboundItemVO.setFromItemId(transferItem.getItemId()).setItemIndex(transferItem.getItemIndex())
-									.setOutingQty(transferItem.getTransferQty()).setFromId(transferItem.getTransferId())
-									.setSkuId(transferItem.getSkuId()).setNonStdCode(transferItem.getONonStdCode())
-									.setInvId(transferItem.getOInvId()).setPriceOut(BigDecimal.ZERO).setOutingAmt(BigDecimal.ZERO);
-							outboundItemVOList.add(outboundItemVO);
+                            // 在入库接口中获取入库明细数据
+                            inboundItemVOList = inboundTransferVO.getItemList().stream()
+                                    .filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
+                            // 通过入库明细数据的item_id查询出inv_id
+                            InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVOList.get(0).getItemId());
+
+                            // 获取调整主表uuid
+                            transferItem.setTransferId(transfer.getTransferId()).setTransferDate(LocalDate.now())
+                                    .setInvId(inboundItemResponse.getInvId());
+                            // 插入调整单明细数据
+                            transferItemMapper.insert(transferItem);
+                            // 赋值入库明细值 并修改入库明细from_item_id值
+                            InboundItem inboundItem= new InboundItem();
+                            inboundItem.setFromItemId(transferItem.getItemId()).setItemId(inboundItemResponse.getItemId());
+                            inboundItemService.updateByUuid(inboundItem);
+
+                            // 在出库接口中获取入库明细数据
+                            outboundItemVOList = outboundTransferVO.getItemList().stream()
+                                    .filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
+                            // 通过出库明细数据的item_id查询出inv_id
+                            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectById(outboundItemVOList.get(0).getItemId());
 						}
-						// 赋值出库接口参数 总表和明细
-						outboundCheckMap.put("total",outboundVO);
-						outboundCheckMap.put("detail",outboundItemVOList);
-						// 调用盘点出库接口
-						outboundCheckService.otherOutboundInsert(outboundCheckMap);
+
 					}
 				}
 			}
@@ -304,9 +333,9 @@ public class TransferService extends BaseService<Transfer> {
 		super.updateByUuid(transferUpdate);
 
 		// 调用入库作废接口
-
+		inboundCheckService.inboundRepeal(id);
 		// 调用出库作废接口
-
+		outboundCheckService.outboundRepeal(id);
 		return ResponseResultUtil.success();
 	}
 }