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

src/main/java/com/dk/mdm/controller/pur/PurchaseController.java

@@ -86,6 +86,16 @@ public class PurchaseController{
         return purchaseService.selectById(id);
     }
 
+    /**
+     * @desc   : 转入库 查询采购订单 总单带明细(过滤明细已入库数据)
+     * @author : 王英杰
+     * @date   : 2024/2/28 14:56
+     */
+    @PostMapping({"pur_select_id/{id}"})
+    public ResponseResultVO purSelectById(@PathVariable String id) {
+        return purchaseService.purSelectById(id);
+    }
+
     @ApiOperation(
             value = "编辑",
             notes = "编辑"

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

@@ -33,6 +33,9 @@
                 <result column="op_app_code" property="opAppCode"/>
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
+        <result column="sku_spec" property="skuSpec"/>
+        <result column="non_std_code" property="nonStdCode"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -97,6 +100,9 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Respons"/>
+        ,sku.sku_images
+        ,sku.sku_spec
+        ,inv.non_std_code
         FROM dkic_b.t_psi_freeze_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id

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

@@ -52,6 +52,7 @@
                 <result column="cp_id" property="cpId"/>
                 <result column="sku_code" property="skuCode"/>
                 <result column="sku_name" property="skuName"/>
+                  <result column="sku_spec" property="skuSpec"/>
                 <result column="sku_model" property="skuModel"/>
                 <result column="brand_name" property="brandName"/>
                 <result column="short_name" property="shortName"/>
@@ -60,6 +61,8 @@
                 <result column="price_standard" property="priceStandard"/>
                 <result column="price_wholesale" property="priceWholesale"/>
                 <result column="price_limited" property="priceLimited"/>
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
+
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -130,6 +133,7 @@
         ,tmgs.price_standard
         ,tmgs.price_wholesale
         ,tmgs.price_limited
+        ,tmgs.sku_images
         ,tmgb.brand_name
         ,tmgb.short_name
         ,tmw.wh_name

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

@@ -46,6 +46,8 @@
             <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
+        <result column="receivable_residue" property="receivableResidue"/>
+        <result column="receipt_residue" property="receiptResidue"/>
     </resultMap>
 
 
@@ -211,6 +213,8 @@
                t.flg_valid,
                t.cp_id,
                coalesce(tmrp.sum_amt_rec, 0) as "sumAmtRec"
+                ,tma.receivable_residue
+                ,tma.receipt_residue
         FROM dkic_b.t_mac_other_receivable as t
                  left join dkic_b.t_mst_customer tmc
                            on tmc.cus_id = t.object_id and t.object_type in ('对象类型-客户')
@@ -219,6 +223,7 @@
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.object_type
                  left join dkic_b.t_mac_rec_pay as tmrp on tmrp.flg_valid and tmrp.biznis_id = t.receivable_id
+                 LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id =  tmc.cus_id
         WHERE receivable_id = #{id}::uuid
     </select>
 

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

@@ -25,6 +25,13 @@ public interface PurchaseItemMapper extends BaseMapper<PurchaseItem>{
     List<PurchaseItemResponse> selectByCond(PurchaseItemQuery purchaseItemQuery);
 
     /**
+     * @desc   : 转入库 查询采购订单 明细(过滤明细已入库数据)
+     * @author : 常皓宁
+     * @date   : 2024/2/28 15:17
+     */
+    List<PurchaseItemResponse> purSelectByCond(PurchaseItemQuery purchaseItemQuery);
+
+    /**
      * @desc   : 根据条件进行查询（数量）
      * @author : 常皓宁
      * @date   : 2024/2/28 15:17

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

@@ -108,7 +108,7 @@
         <result column="inv_id" property="invId"/>
         <result column="inv_qty" property="invQty"/>
         <result column="usable_qty" property="usableQty"/>
-
+        <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
     </resultMap>
 
 
@@ -304,6 +304,7 @@
         ,tmgs.sku_code  as "skuCode"
         ,tmgs.sku_model as "skuModel"
         ,tmgs.sku_name  as "skuName"
+        ,tmgs.sku_images  as "skuImages"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
         ,tmgs.sku_spec  as "skuSpec"
@@ -343,6 +344,63 @@
         </if>
     </select>
 
+    <!-- 查询表dkic_b.t_psi_purchase_item，（条件查询+分页）列表 -->
+    <select id="purSelectByCond" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        ,tppi.from_id  as "fromId"
+        ,tppi.from_item_id  as "fromItemId"
+        ,tpo.order_no  as "orderNo"
+        ,tmgs.sku_code  as "skuCode"
+        ,tmgs.sku_model as "skuModel"
+        ,tmgs.sku_name  as "skuName"
+        ,tmgs.sku_images  as "skuImages"
+        ,tmgb.brand_name  as "brandName"
+        ,tmgb.short_name  as "shortName"
+        ,tmgs.sku_spec  as "skuSpec"
+        ,tmgs.price_purchase  as "pricePurchase"
+        ,tmgs.price_standard  as "priceStandard"
+        ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
+        ,
+        i.inv_id,
+        i.inv_qty,
+        i.usable_qty
+        ,tpp.pur_no as "purNo"
+        FROM dkic_b.t_psi_purchase_item tppi
+        left join(SELECT T.*
+        FROM (select tpi.inv_id,
+        tpi.wh_id,
+        tpi.inv_qty,
+        tpi.usable_qty,
+        tpi.sku_id,
+        tpi.non_std_code,
+        tpi.cp_id,
+        tmw.wh_name,
+        rank()
+        over (partition by tpi.cp_id,tpi.sku_id,tpi.non_std_code order by tpi.inv_id) as RK
+        from dkic_b.t_psi_inventory as tpi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id) T
+        WHERE T.RK = 1) as i on i.sku_id = tppi.sku_id and i.non_std_code = tppi.non_std_code and i.cp_id = tppi.cp_id
+        left join dkic_b.t_psi_order tpo on tpo.order_id = tppi.from_id
+        left join dkic_b.t_mst_goods_sku tmgs on tppi.sku_id = tmgs.sku_id
+        left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
+        left join sys.t_data_kind tdk1 on tdk1.kind_code = tppi.into_status
+        left join dkic_b.t_psi_purchase tpp  on tpp.pur_id = tppi.pur_id
+        where
+        tppi.into_status != '入库状态-已入库'
+            AND tppi.flg_valid = true
+        <if test="cpId != null">
+            AND tppi.cp_id = #{cpId}
+        </if>
+        <if test="purId != null and purId != ''">
+            AND tppi.pur_id = #{purId}::uuid
+        </if>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+
     <!-- 查询表dkic_b.t_psi_purchase_item，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT

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

@@ -27,7 +27,7 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
     List<PurchaseResponse> selectByCond(PurchaseQuery purchaseQuery);
 
     /**
-     * @desc   : 采购入库 查询采购订单带明细
+     * @desc   : 采购入库 查询采购订单带明细（采购入库 查询采购订单 过滤已入库数据）
      * @author : 王英杰
      * @date   : 2024/2/28 15:17
      */

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

@@ -308,7 +308,6 @@
     <!-- 通用条件列 -->
     <sql id="Condition_1">
         <where>
-
             <if test="orgName != null and orgName != ''">
                 AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
             </if>
@@ -403,12 +402,6 @@
                 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>
-            <if test="cpId != null">
-                AND tpp.cp_id = #{cpId}
-            </if>
             <if test="opCreateTime != null">
                 AND tpp.op_create_time = #{opCreateTime}
             </if>
@@ -456,6 +449,12 @@
                 AND  ( tmp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}), '%')or
                 tpp.pur_no LIKE concat('%',my_ex.likequery(#{searchText}), '%'))
             </if>
+            <if test="flgValid != null">
+                AND tpp.flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND tpp.cp_id = #{cpId}
+            </if>
         </where>
     </sql>
 
@@ -914,6 +913,13 @@
         left join dkic_b.t_psi_purchase tppitem  on tppitem.pur_id = tppi.pur_id
         WHERE
         tppi.pur_id = tpp.pur_id
+        AND  tppi.into_status != '入库状态-已入库'
+        <if test="cpId != null">
+            AND tppi.cp_id = #{cpId}
+        </if>
+        <if test="flgValid != null">
+            AND tppi.flg_valid = #{flgValid}
+        </if>
         ) item
         )  AS  "purchaseItemResponseList"
         FROM dkic_b.t_psi_purchase tpp
@@ -924,7 +930,17 @@
         Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
         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"/>
+        where tpp.into_status != '入库状态-已入库'
+        <if test="searchText !=null and searchText!='' " >
+            AND  ( tmp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}), '%')or
+            tpp.pur_no LIKE concat('%',my_ex.likequery(#{searchText}), '%'))
+        </if>
+        <if test="flgValid != null">
+            AND tpp.flg_valid = #{flgValid}
+        </if>
+        <if test="cpId != null">
+            AND tpp.cp_id = #{cpId}
+        </if>
         order by  tpp.make_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -1,8 +1,10 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 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;
@@ -43,7 +45,18 @@ public class FreezeItemResponse extends PageInfo<FreezeItemResponse> implements
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
-
+    /**
+     * 目标批号
+     */
+    @Excel(name = "目标批号")
+    @ApiModelProperty(value = "目标批号")
+    private String nonStdCode;
+    /**
+     * 商品规格
+     */
+    @Excel(name = "商品规格")
+    @ApiModelProperty(value = "商品规格")
+    private String skuSpec;
 
     /**
      * 冻结ID
@@ -53,7 +66,13 @@ public class FreezeItemResponse extends PageInfo<FreezeItemResponse> implements
     @TableField(typeHandler = UuidTypeHandler.class)
     private String freezeId;
 
-
+    /**
+     * 商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray skuImages;
     /**
      * 商品顺序
      */

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

@@ -1,8 +1,10 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 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;
@@ -39,14 +41,25 @@ public class InventoryResponse {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
 
-
+    /**
+     * 商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray skuImages;
     /**
      * 仓库ID
      */
     @ApiModelProperty(value = "仓库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
-
+    /**
+     * 商品规格
+     */
+    @Excel(name = "商品规格")
+    @ApiModelProperty(value = "商品规格")
+    private String skuSpec;
 
     /**
      * 商品ID

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

@@ -56,7 +56,11 @@ public class OtherReceivableResponse extends PageInfo<OtherReceivableResponse> i
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
 
+    @ApiModelProperty(value = "总剩余应收 (总应收账款-总应收收款金额-总应收优惠金额)")
+    private BigDecimal receivableResidue;
 
+    @ApiModelProperty(value = "总收款金额-总应收收款金额+总应收优惠金额（现金池）")
+    private BigDecimal receiptResidue;
     /**
      * 其它收入单号
      */

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.response.pur;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -373,13 +374,14 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
 
     private BigDecimal usableQty;
 
+
     /**
      * 商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
      */
     @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject skuImages;
+    private JSONArray skuImages;
 
 
 

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

@@ -54,6 +54,13 @@ public class CheckItemVO extends PageInfo<CheckItemVO> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String checkId;
 
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
 
     /**
      * 商品顺序

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

@@ -39,7 +39,12 @@ public class OutboundItemVO {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
 
-
+    /**
+     * 入库金额
+     */
+    @Excel(name = "入库金额")
+    @ApiModelProperty(value = "入库金额")
+    private BigDecimal intoAmt;
     /**
      * 出库ID
      */

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

@@ -44,7 +44,12 @@ public class OutboundVO{
     @ApiModelProperty(value = "出库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
-
+    /**
+     * 入库金额
+     */
+    @Excel(name = "入库金额")
+    @ApiModelProperty(value = "入库金额")
+    private BigDecimal intoAmt;
 
     /**
      * 出库单号

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -90,7 +90,7 @@ public class PurchaseService extends BaseService<Purchase> {
         return super.mergeListWithCount(purchaseQuery, purchaseMapper.selectByCond(purchaseQuery), purchaseMapper.countByCond(purchaseQuery));
     }
     /**
-     * @desc : 条件查询 带明细
+     * @desc : 条件查询 带明细（采购入库 查询采购订单 过滤已入库数据）
      * @author : 王英杰
      * @date : 2024/2/28 9:47
      */
@@ -201,6 +201,29 @@ public class PurchaseService extends BaseService<Purchase> {
         return ResponseResultUtil.success(purchaseResponse);
     }
 
+
+    /**
+     * @desc   : 转入库 查询采购订单 总单带明细(过滤明细已入库数据)
+     * @author : 王英杰
+     * @date   : 2024/2/28 14:56
+     */
+    public ResponseResultVO purSelectById(String purId) {
+        //根据id查询
+        PurchaseResponse purchaseResponse = purchaseMapper.selectById(purId);
+        //不存在
+        if (purchaseResponse == null) {
+            return ResponseResultUtil.error(ErrorCodeEnum.PURCHASE_CANNOT_BE_EMPTY.getCode(),
+                    ErrorCodeEnum.PURCHASE_CANNOT_BE_EMPTY.getMessage());
+        }
+        //查询明细 (过滤掉已入库数据)
+        List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.purSelectByCond(new PurchaseItemQuery().setPurId(purId));
+        for (PurchaseItemResponse item : purchaseItemResponses) {
+            item.setPurNo(purchaseResponse.getPurNo());
+        }
+        purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
+        return ResponseResultUtil.success(purchaseResponse);
+    }
+
     /**
      * @desc : 编辑方法
      * @author : 常皓宁