Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -447,6 +447,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     @TableField(exist = false)
     private String fleet;
+    /**
+     * 运输任务号
+     */
+    @TableField(exist = false)
+    private String taskNo;
 
 
     @Override

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

@@ -496,6 +496,16 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private Float freight;
+    /**
+     * 航次
+     */
+    @TableField(exist = false)
+    private String shipNumber;
+    /**
+     * 船名
+     */
+    @TableField(exist = false)
+    private String shipName;
 
     @Override
     protected Serializable pkVal() {

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

@@ -9,6 +9,7 @@ import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.base.service.ICommonStaffRoleService;
 import com.winsea.svc.base.base.service.ICommonStaffService;
+import com.winsea.svc.base.base.util.DateUtils;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.winsea.svc.notice.entity.base.BaseNotice;
@@ -25,6 +26,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranTaskInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.commons.httpclient.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -357,9 +359,12 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
     @Override
     public List<String> selectTranTask(String flag) {
         List<String> stringList=new ArrayList<>();
-        List<ContractManagementInfo> contractManagementInfoList=contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
+        //自运合同
+        List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                 .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
-                .orderBy("update_date",false));
+                .eq("deliver_type", "1")
+                .eq("delete_flag", "0")
+                .orderBy("update_date", false));
         if (!CollectionUtils.isEmpty(contractManagementInfoList)) {
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 Wrapper wrapper=new EntityWrapper();
@@ -378,9 +383,12 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 }
             }
         }
-        List<InOutWarehouseTask> inOutWarehouseTaskList=iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+        List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                 .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
-                .orderBy("update_date",false));
+                .eq("delete_flag", "0")
+                .eq("task_type_key", "3")
+                .eq("in_out_flag", "1")
+                .orderBy("update_date", false));
         if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 Wrapper wrapper=new EntityWrapper();

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

@@ -1483,6 +1483,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     } else {
                                         tranSettlementReport.setTranType("船运");
                                         tranSettlementReport.setTranTypeKey("3");
+                                        tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                        tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
                                     }
                                     tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                                     tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -1597,6 +1599,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranCarInfo.setProcessId(tranProcessInfo.getId());
                                     tranCarInfo.setInfoId(tranTaskInfo.getId());
                                     warehouseInOutInfo.setFreight(tranProcessInfo.getTranPrice());
+                                    warehouseInOutInfo.setTaskNo(tranTaskInfo.getTaskNo());
                                     tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
                                 } else {
                                     throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
@@ -1643,6 +1646,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             } else {
                                 tranSettlementReport.setTranType("船运");
                                 tranSettlementReport.setTranTypeKey("3");
+                                tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
                             }
                             tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -2092,6 +2097,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setProcessId(tranProcessInfo.getId());
                                 tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
                                 warehouseInOutInfo.setFreight(tranProcessInfo.getTranPrice());
+                                warehouseInOutInfo.setTaskNo(tranTaskInfo.getTaskNo());
                                 tranCarInfo.setInfoId(tranTaskInfo.getId());
                             } else {
                                 throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
@@ -2148,6 +2154,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         } else {
                             tranSettlementReport.setTranType("船运");
                             tranSettlementReport.setTranTypeKey("3");
+                            tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                            tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
                         }
                         tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                         tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -4143,6 +4151,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     } else {
                                         tranSettlementReport.setTranType("船运");
                                         tranSettlementReport.setTranTypeKey("3");
+                                        tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                        tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
                                     }
                                     tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                                     tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -4260,6 +4270,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranCarInfo.setInfoId(tranTaskInfo.getId());
                                     tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
                                     warehouseInOutInfo.setFreight(tranProcessInfo.getTranPrice());
+                                    warehouseInOutInfo.setTaskNo(tranTaskInfo.getTaskNo());
                                 } else {
                                     throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
                                 }
@@ -4319,6 +4330,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             } else {
                                 tranSettlementReport.setTranType("船运");
                                 tranSettlementReport.setTranTypeKey("3");
+                                tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
                             }
                             tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
@@ -4822,6 +4835,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setProcessId(tranProcessInfo.getId());
                                 tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
                                 warehouseInOutInfo.setFreight(tranProcessInfo.getTranPrice());
+                                warehouseInOutInfo.setTaskNo(tranTaskInfo.getTaskNo());
                                 tranCarInfo.setInfoId(tranTaskInfo.getId());
                             } else {
                                 throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
@@ -4892,6 +4906,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         } else {
                             tranSettlementReport.setTranType("船运");
                             tranSettlementReport.setTranTypeKey("3");
+                            tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                            tranSettlementReport.setTaskNo(warehouseInOutInfo.getTaskNo());
                         }
                         tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                         tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());

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

@@ -476,6 +476,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     weighingManagement.setCarId(warehouseInOutInfo.getCarId());
                     weighingManagement.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                     weighingManagement.setSelfLoading(warehouseInOutInfo.getSelfLoading());
+                    weighingManagement.setShipName(warehouseInOutInfo.getShipName());
+                    weighingManagement.setShipNumber(warehouseInOutInfo.getShipNumber());
                 }
             }
             CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()