采购

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

@@ -297,6 +297,10 @@
         ,tmgs.sku_name  as "skuName"
         ,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"
+
         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

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

@@ -171,6 +171,7 @@
         <result column="cp_id" property="cpId"/>
         <result column="sku_code" property="skuCode"/>
         <result column="sku_name" property="skuName"/>
+        <result column="price_standard" property="priceStandard"/>
         <result column="sku_model" property="skuModel"/>
         <result column="short_name" property="shortName"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
@@ -451,8 +452,8 @@
         ,tmp.sup_name as "supplierName"
         ,tmw.wh_name as "whName",
         CASE
-        WHEN tpp.pur_status = '订单状态-暂存' THEN tpp.pur_status
-        WHEN tpp.pur_status != '订单状态-暂存' THEN tpp.into_status
+        WHEN tpp.pur_status = '订单状态-暂存' THEN   sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n})
+        WHEN tpp.pur_status != '订单状态-暂存' THEN  sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n})
         END AS "displayedStatus"
         FROM dkic_b.t_psi_purchase tpp
         Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
@@ -460,6 +461,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 as tdk on tdk.kind_code = tpp.pur_status
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = tpp.into_status
         <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -500,6 +503,7 @@
         tmgb.short_name AS  list_short_name,
         tmgs.sku_model AS  list_sku_model,
         tmgs.price_purchase AS  list_price_purchase,
+        tmgs.price_standard AS  list_price_standard,
         tmgs.sku_images AS  list_sku_images,
         tpit.usable_qty AS list_usable_qty,
         tpit.inv_qty AS list_inv_qty,

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

@@ -119,6 +119,7 @@
         <id column="item_id" property="itemId"/>
         <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
         <result column="item_index" property="itemIndex"/>
+        <result column="order_no" property="orderNo"/>
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="item_qty" property="itemQty"/>
         <result column="price_std" property="priceStd"/>
@@ -356,6 +357,8 @@
     </select>
     <sql id="Base_Column_List_Item_Response_Join">
         toi.item_id AS toi_item_id,
+        t.order_id AS toi_order_id,
+        t.order_no AS toi_order_no,
     toi.order_id AS toi_order_id,
     toi.item_index AS toi_item_index,
     toi.sku_id AS toi_sku_id,

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

@@ -45,8 +45,19 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
 
-
+    /**
+     * 商品规格
+     */
+    @Excel(name = "商品规格")
+    @ApiModelProperty(value = "商品规格")
+    private String skuSpec;
     /**
      * 订单ID
      */
@@ -54,8 +65,18 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
-
-
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
+    /**
+     * 采购价
+     */
+    @Excel(name = "采购价")
+    @ApiModelProperty(value = "采购价")
+    private BigDecimal pricePurchase;
     /**
      * 商品顺序
      */
@@ -293,12 +314,7 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
-    /**
-     * 采购标价
-     */
-    @Excel(name = "采购标价")
-    @ApiModelProperty(value = "采购标价")
-    private BigDecimal pricePurchase;
+
 
     /**
      * 商品型号

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

@@ -61,7 +61,12 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "采购订单号")
     private String purNo;
 
-
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
     /**
      * 订单类型 (【系统字典】采购订单)
      */

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

@@ -188,6 +188,9 @@ public class PurchaseService extends BaseService<Purchase> {
         }
         //查询明细
         List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.selectByCond(new PurchaseItemQuery().setPurId(purId));
+        for (PurchaseItemResponse item : purchaseItemResponses) {
+            item.setPurNo(purchaseResponse.getPurNo());
+        }
         purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
         return ResponseResultUtil.success(purchaseResponse);
     }