Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -49,7 +49,7 @@ public enum StatusEnum {
 
     //反馈状态
     FEEDBACK_DO("1", "执行中", "Under implementation"),
-    FEEDBACK_COMPLETED("3", "已完成", "Completed"),
+    FEEDBACK_COMPLETED("3", "已完货", "Completed"),
 
     //签订合同状态
     NOT_SIGNED("1", "未签合同", "not_signed"),

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

@@ -59,12 +59,19 @@ public class TranProcessInfoController {
     }
 
     /**
-     * 更改反馈状态
+     * 更改发货反馈状态
      */
     @PostMapping("/api/editFeedbackStatus")
     public String editFeedbackStatus(@RequestBody TranProcessInfo tranProcessInfo){
         return tranProcessInfoService.editFeedbackStatus(tranProcessInfo.getId());
     }
+    /**
+     * 更改收货反馈状态
+     */
+    @PostMapping("/api/editReceivingStatus")
+    public String editReceivingStatus(@RequestBody TranProcessInfo tranProcessInfo){
+        return tranProcessInfoService.editReceivingStatus(tranProcessInfo.getId());
+    }
 
 
     /**

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

@@ -155,6 +155,12 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date sendDateStart;
+    /**
+     * 装车日期/装船日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date loadingDate;
     /**
      * 到站日期/到港日期
      */

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

@@ -148,13 +148,21 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      */
     private Long signCount;
     /**
-     * 反馈状态标识(1执行中3已完成)
+     * 发货反馈状态标识(1执行中3已完货)
      */
     private String feedbackStatusFlag;
     /**
-     * 反馈状态
+     * 发货反馈状态
      */
     private String feedbackStatus;
+    /**
+     * 收货反馈状态标识(1执行中3已完货)
+     */
+    private String receivingStatusFlag;
+    /**
+     * 收货反馈状态
+     */
+    private String receivingStatus;
     /**
      * 接单时间
      */

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

@@ -45,12 +45,19 @@ public interface ITranProcessInfoService extends IService<TranProcessInfo> {
     String insertTranCar(TranProcessInfo tranProcessInfo);
 
     /**
-     * 更改反馈状态
+     * 更改发货反馈状态
      *
      * @param id
      * @return
      */
     String editFeedbackStatus(String id);
+    /**
+     * 更改收货反馈状态
+     *
+     * @param id
+     * @return
+     */
+    String editReceivingStatus(String id);
     /**
      * 删除运输阶段
      *

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

@@ -287,7 +287,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     }
 
     /**
-     * 更改反馈状态
+     * 更改发货反馈状态
      *
      * @param id
      * @return
@@ -314,6 +314,34 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         }
         return "NG";
     }
+    /**
+     * 更改收货反馈状态
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public String editReceivingStatus(String id) {
+        //查询反馈信息
+        TranProcessInfo tranProcessInfo = this.selectById(id);
+        if (tranProcessInfo != null) {
+            if (StatusEnum.FEEDBACK_DO.getFlag().equals(tranProcessInfo.getReceivingStatusFlag())) {
+                tranProcessInfo.setReceivingStatusFlag(StatusEnum.FEEDBACK_COMPLETED.getFlag());
+                tranProcessInfo.setReceivingStatus(StatusEnum.FEEDBACK_COMPLETED.getName());
+            } else {
+                tranProcessInfo.setReceivingStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
+                tranProcessInfo.setReceivingStatus(StatusEnum.FEEDBACK_DO.getName());
+            }
+            this.updateById(tranProcessInfo);
+            // 插入操作历史
+            String staffName = this.billOperateHisService.getStaffAndName();
+            // 插入操作历史
+            this.billOperateHisService.saveBillOperateHis(tranProcessInfo.getId(), NumberConstant.CONSTANT_FEEDBACK, staffName, null,
+                    tranProcessInfo.getProcessStatus(), null, "");
+            return "OK";
+        }
+        return "NG";
+    }
 
     /**
      * 删除运输阶段

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

@@ -72,6 +72,8 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranProcessInfo.setProcessStatus(StatusEnum.PROCESS_DO.getName());
                 tranProcessInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
                 tranProcessInfo.setFeedbackStatus(StatusEnum.FEEDBACK_DO.getName());
+                tranProcessInfo.setReceivingStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
+                tranProcessInfo.setReceivingStatus(StatusEnum.FEEDBACK_DO.getName());
                 Wrapper<TranProcessInfo> tranProcessInfoWrapper = new EntityWrapper<>();
                 tranProcessInfoWrapper.orderBy("sort",false);
                 tranTaskInfo.setCurrentTransferAddress(tranProcessInfo.getReceivePrivate() + tranProcessInfo.getReceiveCity()

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

@@ -28,6 +28,12 @@
             <if test="feedbackFlag == 2">
                 AND p.feedback_status_flag = '3'
             </if>
+            <if test="feedbackFlag == 4">
+                AND p.receiving_status_flag = '1'
+            </if>
+            <if test="feedbackFlag == 5">
+                AND p.receiving_status_flag = '3'
+            </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
             <if test="tranTypeKey == 1">
@@ -78,6 +84,8 @@
         c.unload_pound_img as unloadPoundImg,
         p.feedback_status AS feedbackStatus,
         p.feedback_status_flag AS feedbackStatusFlag,
+        p.receiving_status AS receivingStatus,
+        p.receiving_status_flag AS receivingStatusFlag,
         p.receiving_date AS receivingDate
         FROM tran_task_info t
         LEFT JOIN tran_process_info p ON t.id=p.info_id
@@ -100,6 +108,12 @@
             <if test="feedbackFlag == 2">
                 AND p.feedback_status_flag = '3'
             </if>
+            <if test="feedbackFlag == 4">
+                AND p.receiving_status_flag = '1'
+            </if>
+            <if test="feedbackFlag == 5">
+                AND p.receiving_status_flag = '3'
+            </if>
         </if>
         <if test="tranTypeKey != null and tranTypeKey != ''">
             <if test="tranTypeKey == 1">