修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchaseOrder.java

@@ -302,6 +302,10 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
      */
     @TableField(exist = false)
     private String goodsType;
+    /**
+     * 合同方
+     */
+    private String contracter;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PurchaseOrderMapper.xml

@@ -111,7 +111,6 @@
         p.procurement_plan as procurementPlan,
         p.order_type as orderType,
         p.goods_name as goodsName,
-        p.customer,
         p.unit_price as unitPrice,
         p.basis,
         p.freezing_deposit as freezingDeposit,
@@ -122,8 +121,6 @@
         p.closed_position as closedPosition,
         p.cumulative_turnover as cumulativeTurnover,
         p.trading_target as tradingTarget,
-        p.seller,
-        p.seller_phone as sellerPhone,
         p.transactions_number as transactionsNumber,
         p.packing_type as packingType,
         p.packing_type_key as packingTypeKey,
@@ -132,8 +129,11 @@
         p.type_key as typeKey,
         p.status,
         p.update_date as updateDate,
-        p.create_date as createDate
+        p.create_date as createDate,
+        i.buyer as contracter,
+        i.procurement_plan_type as procurementPlanType
         FROM purchase_order p
+        left join procurement_plan_info i on p.procurement_plan=i.procurement_plan_no
         WHERE
         p.delete_flag = '0'
         AND p.common_id = #{commonId}
@@ -144,7 +144,6 @@
         s.sale_plan as procurementPlan,
         s.order_type as orderType,
         s.goods_name as goodsName,
-        s.customer,
         s.unit_price as unitPrice,
         s.basis,
         s.freezing_deposit as freezingDeposit,
@@ -155,8 +154,6 @@
         s.closed_position as closedPosition,
         s.cumulative_turnover as cumulativeTurnover,
         s.trading_target as tradingTarget,
-        s.buyer as seller,
-        s.buyer_phone as sellerPhone,
         s.transactions_number as transactionsNumber,
         s.packing_type as packingType,
         s.packing_type_key as packingTypeKey,
@@ -165,8 +162,11 @@
         s.type_key as typeKey,
         s.status,
         s.update_date as updateDate,
-        s.create_date as createDate
+        s.create_date as createDate,
+        i.seller as contracter,
+        i.sale_plan_type as procurementPlanType
         FROM sale_order s
+        left join sale_plan_info i on s.sale_plan=i.sale_plan_no
         WHERE
         s.delete_flag = '0'
         AND s.common_id = #{commonId}