采购订单

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

@@ -297,9 +297,11 @@
         ,tmgs.sku_name  as "skuName"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
+        ,sys.f_get_name_i18n(tdk1.kind_name_i18n, 'zh_CN') as "intoStatusName"
         FROM dkic_b.t_psi_purchase_item tppi
         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
         <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -142,6 +142,8 @@
         <result column="supplierName" property="supplierName"/>
         <result column="whName" property="whName"/>
         <result column="displayedStatus" property="displayedStatus"/>
+        <result column="intoStatusName" property="intoStatusName"/>
+        <result column="purStatusName" property="purStatusName"/>
 
         <collection property="purchaseItemResponseList" resultMap="purchaseItemListMap" columnPrefix="list_"/>
     </resultMap>
@@ -449,8 +451,10 @@
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
         ,tmp.sup_name as "supplierName"
-        ,tmw.wh_name as "whName",
-        CASE
+        ,tmw.wh_name as "whName"
+        ,sys.f_get_name_i18n(tdk1.kind_name_i18n, 'zh_CN') as "intoStatusName"
+        ,sys.f_get_name_i18n(tdk2.kind_name_i18n, 'zh_CN') as "purStatusName"
+        ,CASE
         WHEN tpp.pur_status = '订单状态-暂存' THEN tpp.pur_status
         WHEN tpp.pur_status != '订单状态-暂存' THEN tpp.into_status
         END AS "displayedStatus"
@@ -460,6 +464,8 @@
         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
+        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"/>
         <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/pur/PurchaseItemResponse.java

@@ -313,6 +313,9 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "商品品牌简称")
     @ApiModelProperty(value = "商品品牌简称")
     private String shortName;
+
+    @ApiModelProperty(value = "入库状态")
+    private String intoStatusName;
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -415,6 +415,9 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "采购订单明细")
     private List<PurchaseItemResponse> purchaseItemResponseList;
 
+    @ApiModelProperty(value = "订单状态名称")
+    private String purStatusName;
+
 
     /*
      * 相关属性