采购订单

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

@@ -2901,6 +2901,8 @@
         tms.sup_name              as "supplierName",
         tms.sup_id                as "supplierId",
         tms.sup_type              as "supplierType",
+        tms.contact_name          as "contactName",
+        tms.contact_phone         as "contactPhone",
         tms.flg_valid             as "flgValid"
         from dkic_b.t_mst_supplier tms
         where tms.cp_id = #{cpId}

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

@@ -14,7 +14,7 @@
         tppi.item_index,
         tppi.sku_id,
         tppi.item_qty,
-        tppi.price_std,
+        tppi.price_std as "pricePurchase",
         tppi.amt_std,
         tppi.price_pur,
         tppi.item_amt,

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

@@ -33,20 +33,10 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
 
     /**
      * @desc   : 根据id查询
-     * @date   : 2023/6/28 14:06
-     * @author : 寇珊珊
-     */
-    PurchaseResponse  selectById(@Param("purId") String purId);
-
-
-
-    /**
-     * @desc   : 采购订单号赋值
      * @author : 常皓宁
-     * @date   : 2024/2/28 13:18
+     * @date   : 2024/3/2 11:39
      */
-    void updatePurNO(PurchaseVO purchasevo);
-
+    PurchaseResponse  selectById(@Param("purId") String purId);
 
 }
 

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

@@ -380,11 +380,13 @@
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
+        ,tmp.sup_name as "supplierName"
         FROM dkic_b.t_psi_purchase tpp
         Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
+        Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
         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
-        <include refid="Condition"/>
+        <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -394,8 +396,16 @@
     <!-- 根据主键查询表dkic_b.t_psi_purchase的一行数据 -->
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM dkic_b.t_psi_purchase
+        <include refid="Base_Column_List_Left_join"/>
+        ,tmo.org_name as "orgName"
+        ,tms.staff_name as "staffName"
+        ,tms1.staff_name as "makeStaffName"
+        ,tmp.sup_name as "supplierName"
+        FROM dkic_b.t_psi_purchase tpp
+        Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
+        Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
+        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
         WHERE pur_id = #{purId}::uuid
     </select>
 
@@ -424,16 +434,4 @@
         FROM dkic_b.t_psi_purchase tpp
         <include refid="Condition_1"/>
     </select>
-
-
-    <!--修改采购订单号-->
-    <update id="updatePurNO" parameterType="com.dk.mdm.model.pojo.pur.Purchase">
-        update dkic_b.t_psi_purchase
-        <set>
-            <if test="purNo != null">
-                pur_no= #{purNo},
-            </if>
-        </set>
-        where pur_id = #{purId}::uuid
-    </update>
 </mapper>

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

@@ -293,6 +293,13 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
+    /**
+     * 采购标价
+     */
+    @Excel(name = "采购标价")
+    @ApiModelProperty(value = "采购标价")
+    private BigDecimal pricePurchase;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -386,6 +386,13 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称")
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
 
     @ApiModelProperty(value = "采购订单明细")
     private List<PurchaseItemResponse> purchaseItemResponseList;