修改

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

@@ -225,6 +225,10 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
      */
     @TableField(exist = false)
     private String stockInQuantity;
+    /**
+     * 计划包装方式
+     */
+    private String planPackingType;
 
     /**
      * 已入库量集合

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

@@ -218,6 +218,10 @@ public class SaleOrder extends BaseModel<SaleOrder> {
      */
     @TableField(exist = false)
     private Float money;
+    /**
+     * 计划包装方式
+     */
+    private String planPackingType;
 
     /**
      * 已出库量

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

@@ -7,8 +7,6 @@
         COUNT(p.id)
         FROM purchase_order p
         left join procurement_plan_info i on p.procurement_plan=i.procurement_plan_no
-        left join price_change_record c on p.id=c.order_id
-        left join transaction_record t on p.id=t.order_id
         WHERE
         p.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
@@ -54,22 +52,19 @@
         p.open_position as openPosition,
         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.bagging_notes as baggingNotes,
         p.type,
         p.status,
         p.update_date as updateDate,
-        i.packing_type as packingType,
-        i.weight,
-        c.price_type as priceType,
-        c.price,
-        t.record_flag as recordfFlag,
-        t.transaction_price as transactionPrice,
-        t.turnover,
-        t.basis,
-        t.deal_date as dealDate
+        i.packing_type as planPackingType,
+        i.weight
         FROM purchase_order p
         left join procurement_plan_info i on p.procurement_plan=i.procurement_plan_no
-        left join price_change_record c on p.id=c.order_id
-        left join transaction_record t on p.id=t.order_id
         WHERE
         p.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -7,8 +7,6 @@
         COUNT(s.id)
         FROM sale_order s
         left join sale_plan_info i on s.sale_plan=i.sale_plan_no
-        left join price_change_record c on s.id=c.order_id
-        left join transaction_record t on s.id=t.order_id
         WHERE
         s.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
@@ -54,22 +52,18 @@
         s.open_position as openPosition,
         s.closed_position as closedPosition,
         s.cumulative_turnover as cumulativeTurnover,
+        s.buyer,
+        s.buyer_phone as buyerPhone,
+        s.transactions_number as transactionsNumber,
+        s.packing_type as packingType,
+        s.bagging_notes as baggingNotes,
         s.type,
         s.status,
         s.update_date as updateDate,
-        i.packing_type as packingType,
-        i.weight,
-        c.price_type as priceType,
-        c.price,
-        t.record_flag as recordfFlag,
-        t.transaction_price as transactionPrice,
-        t.turnover,
-        t.basis,
-        t.deal_date as dealDate
+        i.packing_type as planPackingType,
+        i.weight
         FROM sale_order s
         left join sale_plan_info i on s.sale_plan=i.sale_plan_no
-        left join price_change_record c on s.id=c.order_id
-        left join transaction_record t on s.id=t.order_id
         WHERE
         s.delete_flag = '0'
         <if test="searchType != null and searchType != ''">