1

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

@@ -113,6 +113,14 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
      * 当前中转地址
      */
     private String currentTransferAddress;
+    /**
+     * 装船重量（吨）
+     */
+    private Double shippedWeight;
+    /**
+     * 附件
+     */
+    private String enclosure;
     /**
      * 运输方式(1汽运2火运3船运)
      */
@@ -177,6 +185,16 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
      */
     @TableField(exist = false)
     private Integer count;
+    /**
+     * 船名
+     */
+    @TableField(exist = false)
+    private String shipName;
+    /**
+     * 航次
+     */
+    @TableField(exist = false)
+    private String shipNo;
 
     @Override
     protected Serializable pkVal() {

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

@@ -426,6 +426,13 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 Wrapper wrapper=new EntityWrapper();
                 if ("1".equals(flag)){
                     wrapper.eq("tran_type","船运");
+                    //查看船名和航次
+                    TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                            .eq("info_id", tranTaskInfo.getId()));
+                    if (tranCarInfo!=null){
+                        tranTaskInfo.setShipName(tranCarInfo.getShipName());
+                        tranTaskInfo.setShipNo(tranCarInfo.getShipNo());
+                    }
                 }
                 else {
                     wrapper.eq("tran_type","火运");

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

@@ -201,6 +201,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         pageView.put("currentPage", warehousingOrder.getCurrentPage());
         pageView.put("startDate", warehousingOrder.getStartDate());
         pageView.put("endDate", warehousingOrder.getEndDate());
+        pageView.put("compId", warehousingOrder.getCompId());
         pageView.put("baseId", warehousingOrder.getBaseId());
         pageView.put("businessKeys", businessKeys);
         pageView.put("flag", warehousingOrder.getFlag());

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

@@ -9,7 +9,8 @@
         COUNT(id)
         FROM warehousing_order
         WHERE
-        delete_flag = '0'
+        comp_id = #{compId}
+        and delete_flag = '0'
         <if test="startDate != null">
             AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
@@ -84,6 +85,8 @@
         FROM warehousing_order w
         LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
         WHERE
+        w.comp_id = #{compId}
+        and
         w.delete_flag = '0'
         <if test="startDate != null">
             AND (DATE_FORMAT(w.create_date,"%Y%m%d") &gt;=