加字段

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

@@ -388,6 +388,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private String appFlag;
+    /**
+     * 实收卸车过磅费
+     */
+    @TableField(exist = false)
+    private Double actualWeighingFee;
     /**
      * 银行信息
      */

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

@@ -83,6 +83,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 车牌号
      */
     private String carNumber;
+    /**
+     * 车型
+     */
+    private String carModel;
     /**
      * 箱号
      */

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

@@ -220,6 +220,14 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 仓库名称
      */
     private String warehouseName;
+    /**
+     * 应收卸车过磅费
+     */
+    private Double receivableWeighingFee;
+    /**
+     * 实收卸车过磅费
+     */
+    private Double actualWeighingFee;
     /**
      * 已称皮重状态（1是）
      */

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

@@ -35,6 +35,6 @@
             AND lower(w.warehouse_city) like lower(CONCAT('%',#{city},'%'))
         </if>
         GROUP BY a.id
-        ORDER BY a.check_flag DESC
+        ORDER BY a.update_date DESC,a.check_flag DESC
     </select>
 </mapper>

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

@@ -146,6 +146,7 @@
         q.water_content as waterContent,
         q.mildew_grain as mildewGrain,
         a.grain_money as grainMoney,
+        w.actual_weighing_fee as actualWeighingFee,
         a.actual_payment as actualPayment
         FROM payment_management a
         left join quality_inspection_management q on q.relation_id = a.relation_id and q.comp_id = a.comp_id and q.delete_flag = 0