修改

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

@@ -1,9 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +18,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/contractGoodsInfo")
 public class ContractGoodsInfoController {
 
+    @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
+
+    /**
+     * 查看
+     * @param contractId
+     * @return
+     */
+    @GetMapping("/getGoodsName")
+    public ContractGoodsInfo getGoodsName(String contractId) {
+        return contractGoodsInfoService.getGoodsName(contractId);
+    }
 }
 

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

@@ -152,11 +152,11 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     /**
      * 状态标识
      */
-    private String statusFlag;
+    private String processStatusFlag;
     /**
      * 状态
      */
-    private String status;
+    private String processStatus;
     /**
      * 状态英文
      */

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

@@ -154,6 +154,16 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
     @TableField(exist = false)
     private String end;
 
+    /**
+     * 调度状态标识
+     */
+    @TableField(exist = false)
+    private String processStatusFlag;
+    /**
+     * 调度状态
+     */
+    @TableField(exist = false)
+    private String processStatus;
 
     @TableField(exist = false)
     private List<TranProcessInfo> tranProcessInfoList;

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 
 /**
  * <p>
@@ -13,4 +14,10 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IContractGoodsInfoService extends IService<ContractGoodsInfo> {
 
+    /**
+     * 查看
+     *
+     * @param
+     */
+    ContractGoodsInfo getGoodsName(String contractId);
 }

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

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractGoodsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ContractGoodsInfoServiceImpl extends ServiceImpl<ContractGoodsInfoMapper, ContractGoodsInfo> implements IContractGoodsInfoService {
 
+    /**
+     * 查看
+     * @param contractId
+     * @return
+     */
+    @Override
+    public ContractGoodsInfo getGoodsName(String contractId){
+        ContractGoodsInfo contractGoodsInfo = this.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractId));
+        return contractGoodsInfo;
+    }
 }

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

@@ -11,7 +11,6 @@ import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranProcessInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranProcessInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranProcessInfoService;
@@ -81,16 +80,17 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         // 查询调度信息
         TranProcessInfo tranProcessInfo = this.selectById(id);
         if (tranProcessInfo != null) {
-            if (StatusEnum.PROCESS_DO.getFlag().equals(tranProcessInfo.getStatusFlag())) {
-                tranProcessInfo.setStatusFlag(StatusEnum.PROCESS_COMPLETED.getFlag());
-                tranProcessInfo.setStatus(StatusEnum.PROCESS_COMPLETED.getName());
+            if (StatusEnum.PROCESS_DO.getFlag().equals(tranProcessInfo.getProcessStatusFlag())) {
+                tranProcessInfo.setProcessStatusFlag(StatusEnum.PROCESS_COMPLETED.getFlag());
+                tranProcessInfo.setProcessStatus(StatusEnum.PROCESS_COMPLETED.getName());
+
             }
             this.updateById(tranProcessInfo);
             // 插入操作历史
             String staffName = this.billOperateHisService.getStaffAndName();
             // 插入操作历史
             this.billOperateHisService.saveBillOperateHis(tranProcessInfo.getId(), NumberConstant.CONSTANT_PROCESS, staffName, null,
-                    tranProcessInfo.getStatus(), null, "");
+                    tranProcessInfo.getProcessStatus(), null, "");
             return "OK";
         }
         return "NG";
@@ -194,7 +194,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             String staffName = this.billOperateHisService.getStaffAndName();
             // 插入操作历史
             this.billOperateHisService.saveBillOperateHis(tranProcessInfo.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
-                    tranProcessInfo.getStatus(), null, "");
+                    tranProcessInfo.getProcessStatus(), null, "");
             return "OK";
         }
         return "NG";

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

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 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.yh.saas.common.support.util.IdGenerator;
@@ -21,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -41,8 +40,6 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
     @Autowired
     private ITranTaskInfoService tranTaskInfoService;
     @Autowired
-    private ITranCarInfoService tranCarInfoService;
-    @Autowired
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
@@ -67,12 +64,17 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranProcessInfo.setGoodsNameKey(tranTaskInfo.getGoodsNameKey());
                 tranProcessInfo.setContractNo(tranTaskInfo.getContractNo());
                 tranProcessInfo.setReceivingDate(tranTaskInfo.getCreateDate());
-                tranProcessInfo.setStatusFlag(StatusEnum.PROCESS_DO.getFlag());
-                tranProcessInfo.setStatus(StatusEnum.PROCESS_DO.getName());
+                tranProcessInfo.setProcessStatusFlag(StatusEnum.PROCESS_DO.getFlag());
+                tranProcessInfo.setProcessStatus(StatusEnum.PROCESS_DO.getName());
                 tranProcessInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
                 tranProcessInfo.setFeedbackStatus(StatusEnum.FEEDBACK_DO.getName());
+                Wrapper<TranProcessInfo> tranProcessInfoWrapper = new EntityWrapper<>();
+                tranProcessInfoWrapper.orderBy("sort",false);
+                tranTaskInfo.setCurrentTransferAddress(tranProcessInfo.getReceivePrivate() + tranProcessInfo.getReceiveCity()
+                    + tranProcessInfo.getReceiveArea() + tranProcessInfo.getReceiveDetailedAddress() );
             }
         }
+
         //判断任务编号是否唯一
         List<TranTaskInfo> tranTaskInfoList = tranTaskInfoService.selectList(new EntityWrapper<TranTaskInfo>()
                 .eq(TranTaskInfo.QueryFiles.TASK_NO,tranTaskInfo.getTaskNo())

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

@@ -13,10 +13,10 @@
         and p.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND p.status_flag = '1'
+                AND p.process_status_flag = '1'
             </if>
             <if test="searchType == 2">
-                AND p.status_flag = '3'
+                AND p.process_status_flag = '3'
             </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
@@ -59,8 +59,8 @@
         concat(p.receive_private,p.receive_city,p.receive_area,p.receive_detailed_address,p.receiver,p.receiver_phone) AS receive,
         p.delivery_date_start AS deliveryDateStart,
         p.delivery_date_end AS deliveryDateEnd,
-        p.status,
-        p.status_flag AS statusFlag,
+        p.process_status AS processStatus,
+        p.process_status_flag AS processStatusFlag,
         p.tran_type AS tranType,
         p.tran_type_key AS tranTypeKey,
         p.feedback_status AS feedbackStatus,
@@ -73,10 +73,10 @@
         and p.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND p.status_flag = '1'
+                AND p.process_status_flag = '1'
             </if>
             <if test="searchType == 2">
-                AND p.status_flag = '3'
+                AND p.process_status_flag = '3'
             </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
@@ -103,7 +103,7 @@
             OR lower(p.receiver) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(p.process_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
-        ORDER BY p.status DESC,p.update_date DESC
+        ORDER BY p.process_status DESC,p.update_date DESC
     </select>
 
 </mapper>

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

@@ -6,6 +6,7 @@
         SELECT
         COUNT(t.id)
         FROM tran_task_info t
+        LEFT JOIN tran_process_info p ON t.id=p.info_id
         WHERE
         t.comp_id = #{compId}
         and t.delete_flag = '0'
@@ -55,8 +56,11 @@
         t.end_area as endArea,
         t.end_detailed_address as endDetailedAddress,
         t.receive_warehouse as receiveWarehouse,
+        p.process_status_flag as processStatusFlag,
+        p.process_status as processStatus,
         t.status
         FROM tran_task_info t
+        LEFT JOIN tran_process_info p ON t.id=p.info_id
         WHERE
         t.comp_id = #{compId}
         and t.delete_flag = '0'