修改

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

@@ -94,5 +94,14 @@ public class TranTaskInfoController {
     public List<WarehouseBaseInfo> selectWarehouseList(String compId,String warehouseType) {
         return tranTaskInfoService.selectWarehouseList(compId,warehouseType);
     }
+    /**
+     * 根据合同号查运输任务
+     * @param contractNo
+     * @return
+     */
+    @GetMapping("/selectTranTask")
+    public List<TranTaskInfo> selectTranTask(String contractNo){
+        return tranTaskInfoService.selectTranTask(contractNo);
+    }
 }
 

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

@@ -68,5 +68,12 @@ public interface ITranTaskInfoService extends IService<TranTaskInfo> {
      * @param compId
      */
     List<WarehouseBaseInfo> selectWarehouseList(String compId, String warehouseType);
+    /**
+     * 根据合同号查运输任务
+     *
+     * @param contractNo
+     */
+    List<TranTaskInfo> selectTranTask(String contractNo);
+
 
 }

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

@@ -96,7 +96,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             List<ContractManagementInfo> contractManagementInfoList =
                     contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                             .eq(ContractManagementInfo.QueryFiles.COMP_ID, AuthSecurityUtils.getCurrentUserInfo().getCompId())
-                            .eq(ContractManagementInfo.QueryFiles.CONTRACT_NO, contractManagementInfo.getAgreementNo())
+                            .eq(ContractManagementInfo.QueryFiles.CONTRACT_NO, contractManagementInfo.getContractNo())
                             .eq(ContractManagementInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
             if (contractManagementInfoList.size() > 0) {
                 throw new YException(YExceptionEnum.AGREEMENT_NO_ERROR);
@@ -112,38 +112,38 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             if (contractManagementInfos.size() > 0) {
                 throw new YException(YExceptionEnum.CONTRACT_NO_ERROR);
             }
-            //自运采购合同添加临时仓库
-            if (NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
-                WarehouseBaseInfo warehouseBaseInfo = new WarehouseBaseInfo();
-                warehouseBaseInfo.setId(IdGenerator.generateUUID());
-                warehouseBaseInfo.setWarehouseName(contractManagementInfo.getContractNo());
-                warehouseBaseInfo.setPersonChargeKey(contractManagementInfo.getPersonChargeKey());
-                warehouseBaseInfo.setPersonCharge(contractManagementInfo.getPersonCharge());
-                warehouseBaseInfo.setPersonPhone(contractManagementInfo.getPersonPhone());
-                warehouseBaseInfo.setCreateType("1");
-                warehouseBaseInfo.setCompId(contractManagementInfo.getCompId());
-                warehouseBaseInfo.setWarehousePrivate(contractManagementInfo.getSourceProvince());
-                warehouseBaseInfo.setWarehouseCity(contractManagementInfo.getSourceCity());
-                warehouseBaseInfo.setWarehouseArea(contractManagementInfo.getSourceArea());
-                warehouseBaseInfo.setDetailedAddress(contractManagementInfo.getSourceGoods());
-                //临时仓库流转页面
-                WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
-                warehouseInOutInfo.setId(IdGenerator.generateUUID());
-                warehouseInOutInfo.setBaseId(warehouseBaseInfo.getId());
-                warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
-                warehouseInOutInfo.setWarehouseName(contractManagementInfo.getContractNo());
-                warehouseInOutInfo.setStatusFlag("3");
-                warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
-                warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
-                warehouseInOutInfo.setGoodsName(contractManagementInfo.getGoodsName());
-                warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
-                warehouseInOutInfo.setInOutType(NumberConstant.PURCHASE_WAREHOUSING);
-                warehouseInOutInfo.setBackOfficeId(contractManagementInfo.getCreateUserId());
-                warehouseInOutInfo.setBackOffice(AuthSecurityUtils.getStaffById(contractManagementInfo.getCreateUserId()).getStaffName());
-                warehouseInOutInfo.setInOutDate(contractManagementInfo.getSigningDate());
-                warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
-                warehouseInOutInfoService.insert(warehouseInOutInfo);
-            }
+        }
+        //自运采购合同添加临时仓库
+        if (NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
+            WarehouseBaseInfo warehouseBaseInfo = new WarehouseBaseInfo();
+            warehouseBaseInfo.setId(IdGenerator.generateUUID());
+            warehouseBaseInfo.setWarehouseName(contractManagementInfo.getContractNo());
+            warehouseBaseInfo.setPersonChargeKey(contractManagementInfo.getPersonChargeKey());
+            warehouseBaseInfo.setPersonCharge(contractManagementInfo.getPersonCharge());
+            warehouseBaseInfo.setPersonPhone(contractManagementInfo.getPersonPhone());
+            warehouseBaseInfo.setCreateType("1");
+            warehouseBaseInfo.setCompId(contractManagementInfo.getCompId());
+            warehouseBaseInfo.setWarehousePrivate(contractManagementInfo.getSourceProvince());
+            warehouseBaseInfo.setWarehouseCity(contractManagementInfo.getSourceCity());
+            warehouseBaseInfo.setWarehouseArea(contractManagementInfo.getSourceArea());
+            warehouseBaseInfo.setDetailedAddress(contractManagementInfo.getSourceGoods());
+            //临时仓库流转页面
+            WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
+            warehouseInOutInfo.setId(IdGenerator.generateUUID());
+            warehouseInOutInfo.setBaseId(warehouseBaseInfo.getId());
+            warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
+            warehouseInOutInfo.setWarehouseName(contractManagementInfo.getContractNo());
+            warehouseInOutInfo.setStatusFlag("3");
+            warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
+            warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
+            warehouseInOutInfo.setGoodsName(contractManagementInfo.getGoodsName());
+            warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
+            warehouseInOutInfo.setInOutType(NumberConstant.PURCHASE_WAREHOUSING);
+            warehouseInOutInfo.setBackOfficeId(contractManagementInfo.getCreateUserId());
+            warehouseInOutInfo.setBackOffice(AuthSecurityUtils.getStaffById(contractManagementInfo.getCreateUserId()).getStaffName());
+            warehouseInOutInfo.setInOutDate(contractManagementInfo.getSigningDate());
+            warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
+            warehouseInOutInfoService.insert(warehouseInOutInfo);
         }
         // 货物信息新增
         ContractGoodsInfo contractGoodsInfo = contractManagementInfo.getContractGoodsInfo();

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

@@ -39,14 +39,12 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
 
     @Autowired
     private INewWorkflowService workflowService;
-
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
     private IDriverViewInfoService driverViewInfoService;
-
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
 
@@ -71,7 +69,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
             statusSet.addAll(statusList);
         }
-
         //公司id
         pageView.put("compId", tranSettlementReport.getCompId());
         pageView.put("searchKeyWord", tranSettlementReport.getSearchKeyWord());
@@ -79,17 +76,16 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
         pageView.put("pageSize", tranSettlementReport.getPageSize());
         pageView.put("currentPage", tranSettlementReport.getCurrentPage());
         pageView.put("tranTypeKey", tranSettlementReport.getTranTypeKey());
+        pageView.put("taskNo", tranSettlementReport.getTaskNo());
+        pageView.put("processNo", tranSettlementReport.getProcessNo());
         pageView.put("contractNo", tranSettlementReport.getContractNo());
         pageView.put("roleFlag", tranSettlementReport.getRoleFlag());
         pageView.put("statusFlag", tranSettlementReport.getStatusFlag());
         pageView.put("businessKeys", businessKeys);
         pageView.put("statusSet", statusSet);
-
-
-        // 查询汽运信息总数
+        // 查询结算统计信息总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<TranSettlementReport> dataList = baseMapper.getListByCondition(pageView);
-
         if (!CollectionUtils.isEmpty(dataList)) {
             for (TranSettlementReport tranSettlementReport1 : dataList) {
                 //查询账户信息
@@ -102,7 +98,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                                 .eq("driver_id", driverViewInfo.getId())
                                 .eq("delete_flag", "0"));
                         tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
-
                     }
                 }
                 String taskId = "";
@@ -113,7 +108,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                     tranSettlementReport1.setTaskId(taskId);
                 }
             }
-
         }
         Page<TranSettlementReport> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
@@ -269,4 +270,27 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 .orderBy(WarehouseBaseInfo.QueryFiles.UPDATE_DATE, false));
         return warehouseBaseInfoList;
     }
+
+    /**
+     * 根据合同号查运输任务
+     * @param contractNo
+     * @return
+     */
+    @Override
+    public List<TranTaskInfo> selectTranTask(String contractNo) {
+        List<TranTaskInfo> tranTaskInfoList=this.selectList(new EntityWrapper<TranTaskInfo>()
+        .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()));
+                if (!CollectionUtils.isEmpty(tranProcessInfos)){
+                    tranTaskInfo.setTranProcessInfoList(tranProcessInfos);
+                }
+            }
+        }
+        return tranTaskInfoList;
+    }
 }

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

@@ -20,6 +20,12 @@
         <if test="tranTypeKey != null and tranTypeKey != ''">
             AND tran_type_key = #{tranTypeKey}
         </if>
+        <if test="taskNo != null and taskNo != ''">
+            AND task_no = #{taskNo}
+        </if>
+        <if test="processNo != null and processNo != ''">
+            AND process_no = #{processNo}
+        </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
@@ -91,6 +97,12 @@
         <if test="tranTypeKey != null and tranTypeKey != ''">
             AND tran_type_key = #{tranTypeKey}
         </if>
+        <if test="taskNo != null and taskNo != ''">
+            AND task_no = #{taskNo}
+        </if>
+        <if test="processNo != null and processNo != ''">
+            AND process_no = #{processNo}
+        </if>
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>