修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranTaskInfoController.java

@@ -95,13 +95,22 @@ public class TranTaskInfoController {
         return tranTaskInfoService.selectWarehouseList(compId,warehouseType);
     }
     /**
-     * 根据合同号查运输任务
-     * @param contractNo
+     * 查合同号下拉列表
+     * flag(1船运 2火运）
+     * @param flag
      * @return
      */
     @GetMapping("/selectTranTask")
-    public List<TranTaskInfo> selectTranTask(String contractNo){
-        return tranTaskInfoService.selectTranTask(contractNo);
+    public List<String> selectTranTask(String flag){
+        return tranTaskInfoService.selectTranTask(flag);
+    }
+    /**
+     * 根据合同号查运输任务
+     * @param contractNo
+     */
+    @GetMapping("/selectTask")
+    public List<TranTaskInfo> selectTask(String contractNo,String flag){
+        return tranTaskInfoService.selectTask(contractNo,flag);
     }
 }
 

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

@@ -43,7 +43,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     private String compId;
     /**
-     * 合同号
+     * 合同号/补充协议编号
      */
     private String contractNo;
     /**
@@ -67,7 +67,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     private String priceType;
     /**
-     * 补充协议编号
+     * 关联合同
      */
     private String agreementNo;
     /**

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

@@ -182,7 +182,7 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      */
     private String statusEn;
     /**
-     * 最终阶段标识（1是）
+     * 粮款结算阶段标识（1是）
      */
     private String endFlag;
     /**

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

@@ -68,12 +68,18 @@ public interface ITranTaskInfoService extends IService<TranTaskInfo> {
      * @param compId
      */
     List<WarehouseBaseInfo> selectWarehouseList(String compId, String warehouseType);
+    /**
+     * 查合同号下拉列表
+     * flag(1船运 2火运）
+     * @param flag
+     */
+    List<String> selectTranTask(String flag);
     /**
      * 根据合同号查运输任务
      *
      * @param contractNo
      */
-    List<TranTaskInfo> selectTranTask(String contractNo);
+    List<TranTaskInfo> selectTask(String contractNo,String flag);
 
 
 }

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

@@ -264,6 +264,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     else {
 
                         // 设置状态 已提交审核
+                        //状态清空
+                        contractManagementInfo.setStatusFlag("");
+                        contractManagementInfo.setStatus("");
                         contractManagementInfo.setWorkflowId(workflow.getId());
                         this.updateById(contractManagementInfo);
                         workflowService.startInstance(workflow.getId(), contractManagementInfo.getId());
@@ -271,7 +274,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 }
                 // 退回的单子 再启用
                 else {
-
+                    //状态清空
+                    contractManagementInfo.setStatusFlag("");
+                    contractManagementInfo.setStatus("");
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
@@ -288,7 +293,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     }
                     // 开启审核流
                     else {
-
+                        //状态清空
+                        contractManagementInfo.setStatusFlag("");
+                        contractManagementInfo.setStatus("");
                         // 设置状态 已提交审核
                         contractManagementInfo.setWorkflowId(workflow.getId());
                         this.updateById(contractManagementInfo);
@@ -297,7 +304,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 }
                 // 退回的单子 再启用
                 else {
-
+                    //状态清空
+                    contractManagementInfo.setStatusFlag("");
+                    contractManagementInfo.setStatus("");
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }

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

@@ -14,11 +14,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranTaskInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.ITranProcessInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.ITranTaskInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +44,10 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IInOutWarehouseTaskService iInOutWarehouseTaskService;
     /**
      * 创建运输任务
      * @param tranTaskInfo
@@ -271,21 +272,85 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
         return warehouseBaseInfoList;
     }
 
+    /**
+     * 查合同号下拉列表
+     * flag(1船运 2火运）
+     * @param flag
+     * @return
+     */
+    @Override
+    public List<String> selectTranTask(String flag) {
+        List<String> stringList=new ArrayList<>();
+        List<ContractManagementInfo> contractManagementInfoList=contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
+                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                .orderBy("update_date",false));
+        if (!CollectionUtils.isEmpty(contractManagementInfoList)) {
+            for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+                Wrapper wrapper=new EntityWrapper();
+                wrapper.eq("contract_no", contractManagementInfo.getContractNo());
+                if ("1".equals(flag)){
+                    wrapper.eq("tran_type","船运");
+                }
+                else {
+                    wrapper.eq("tran_type","火运");
+                }
+                List<TranProcessInfo> tranProcessInfos = tranProcessInfoService.selectList(wrapper);
+                if (!CollectionUtils.isEmpty(tranProcessInfos)){
+                    for (TranProcessInfo tranProcessInfo:tranProcessInfos){
+                        stringList.add(tranProcessInfo.getContractNo());
+                    }
+                }
+            }
+        }
+        List<InOutWarehouseTask> inOutWarehouseTaskList=iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                .orderBy("update_date",false));
+        if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
+            for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
+                Wrapper wrapper=new EntityWrapper();
+                wrapper.eq("contract_no", inOutWarehouseTask.getMoveTaskNo());
+                if ("1".equals(flag)){
+                    wrapper.eq("tran_type","船运");
+                }
+                else {
+                    wrapper.eq("tran_type","火运");
+                }
+                List<TranProcessInfo> tranProcessInfos = tranProcessInfoService.selectList(wrapper);
+                if (!CollectionUtils.isEmpty(tranProcessInfos)){
+                    for (TranProcessInfo tranProcessInfo:tranProcessInfos){
+                        stringList.add(tranProcessInfo.getContractNo());
+                    }
+                }
+            }
+        }
+        LinkedHashSet<String> hashSet = new LinkedHashSet<>(stringList);
+        ArrayList<String> listWithoutDuplicates = new ArrayList<>(hashSet);
+        return listWithoutDuplicates;
+    }
     /**
      * 根据合同号查运输任务
      * @param contractNo
-     * @return
      */
     @Override
-    public List<TranTaskInfo> selectTranTask(String contractNo) {
+    public List<TranTaskInfo> selectTask(String contractNo,String flag) {
         List<TranTaskInfo> tranTaskInfoList=this.selectList(new EntityWrapper<TranTaskInfo>()
-        .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
-        .eq("contract_no",contractNo)
-        .orderBy("update_date",false));
+                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                .eq("contract_no",contractNo)
+                .orderBy("update_date",false));
         if (!CollectionUtils.isEmpty(tranTaskInfoList)){
-            for (TranTaskInfo tranTaskInfo:tranTaskInfoList){
-                List<TranProcessInfo> tranProcessInfos = tranProcessInfoService.selectList(new EntityWrapper<TranProcessInfo>()
-                        .eq(TranProcessInfo.QueryFiles.INFO_ID, tranTaskInfo.getId()));
+            for (TranTaskInfo tranTaskInfo : tranTaskInfoList) {
+                Wrapper wrapper=new EntityWrapper();
+                if ("1".equals(flag)){
+                    wrapper.eq("tran_type","船运");
+                }
+                else {
+                    wrapper.eq("tran_type","火运");
+                }
+                //查看运输阶段信息
+                wrapper.eq(TranProcessInfo.QueryFiles.INFO_ID,tranTaskInfo.getId())
+                        .eq(TranProcessInfo.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0)
+                         .orderBy(TranProcessInfo.QueryFiles.SORT);
+                List<TranProcessInfo> tranProcessInfos = tranProcessInfoService.selectList(wrapper);
                 if (!CollectionUtils.isEmpty(tranProcessInfos)){
                     tranTaskInfo.setTranProcessInfoList(tranProcessInfos);
                 }