修改

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

@@ -51,10 +51,30 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 运输任务编号
+     */
+    private String taskNo;
     /**
      * 运输阶段
      */
     private String processNo;
+    /**
+     * 运输方式key
+     */
+    private String tranTypeKey;
+    /**
+     * 运输方式(1汽运2火运3船运)
+     */
+    private String tranType;
+    /**
+     * 船运类型(集装箱，散船)
+     */
+    private String shipType;
+    /**
+     * 箱号/仓位号
+     */
+    private String boxNo;
     /**
      * 电话
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -249,6 +249,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 tranSettlementReport.setCompId(tranTaskInfo.getCompId());
                                 tranSettlementReport.setCarId(tranCarInfo.getId());
                                 tranSettlementReport.setId(IdGenerator.generateUUID());
+                                tranSettlementReport.setTranType("汽运");
+                                tranSettlementReport.setTranTypeKey("1");
                                 tranSettlementReport.setContractNo(tranTaskInfo.getContractNo());
                                 tranSettlementReport.setProcessNo(tranProcessInfo.getProcessNo());
                                 tranSettlementReport.setName(tranCarInfo.getDriver());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -78,6 +78,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
         pageView.put("searchType", tranSettlementReport.getSearchType());
         pageView.put("pageSize", tranSettlementReport.getPageSize());
         pageView.put("currentPage", tranSettlementReport.getCurrentPage());
+        pageView.put("tranTypeKey", tranSettlementReport.getTranTypeKey());
         pageView.put("contractNo", tranSettlementReport.getContractNo());
         pageView.put("roleFlag", tranSettlementReport.getRoleFlag());
         pageView.put("statusFlag", tranSettlementReport.getStatusFlag());

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

@@ -17,6 +17,9 @@
                 AND amount_ing_payable-amount_ed_payable=0
             </if>
         </if>
+        <if test="tranTypeKey != null and tranTypeKey != ''">
+            tran_type_key = #{tranTypeKey}
+        </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
@@ -82,6 +85,9 @@
                 AND amount_ing_payable-amount_ed_payable=0
             </if>
         </if>
+        <if test="tranTypeKey != null and tranTypeKey != ''">
+            tran_type_key = #{tranTypeKey}
+        </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>