确认装车卸车

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

@@ -146,6 +146,17 @@ public enum StatusEnum {
     DRIVER_ORDER_SIGN("11", "待签约", "driver_order_sign"),
     DRIVER_ORDER_END("13", "已终止", "driver_order_end"),
 
+    //装车反馈状态
+    NOT_LOADING("1","未装车","not_loading"),
+    LOADING("3","已装车","loading"),
+    //卸车反馈状态
+    NOT_UNLOADING("1","未卸车","not_unloading"),
+    UNLOADING("3","已卸车","unloading"),
+    //装车确认状态
+    NOT_LOADING_CONFIRM("1", "未确认", "not_loading_confirm"),
+    LOADING_CONFIRM("3", "已确认", "loading_confirm"),
+
+
 
     ;
     @Getter

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

@@ -1,6 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ICarrierInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -16,6 +21,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/carrierInfo")
 public class CarrierInfoController {
+    @Autowired
+    private ICarrierInfoService carrierInfoService;
+    /**
+     * 确认装车
+     *
+     * @param carrierInfo
+     * @return
+     */
+    @PostMapping("/loadingAdd")
+    public String loadingAdd(@RequestBody CarrierInfo carrierInfo) {
+        return carrierInfoService.loadingAdd(carrierInfo);
+    }
+
+    /**
+     * 确认卸车
+     *
+     * @param carrierInfo
+     * @return
+     */
+     @PostMapping("/unLoadingAdd")
+     public String unLoadingAdd(@RequestBody CarrierInfo carrierInfo) {
+         return carrierInfoService.unLoadingAdd(carrierInfo);
+    }
 
 }
 

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

@@ -40,12 +40,16 @@ public class CarrierInfo extends BaseModel<CarrierInfo> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
     /**
      * 订单id
      */
     private String orderId;
     /**
-     * 装车反馈状态key（1未装车3已装车5未确认7已确认）
+     * 装车反馈状态key（1未装车3已装车）
      */
     private String loadingStatusKey;
     /**
@@ -69,7 +73,11 @@ public class CarrierInfo extends BaseModel<CarrierInfo> {
      */
     private String loadingImg;
     /**
-     * 卸车反馈状态key（1未卸车3已卸车5未确认7已确认）
+     * 装车照片
+     */
+    private String loadingJmg;
+    /**
+     * 卸车反馈状态key（1未卸车3已卸车）
      */
     private String unloadingStatusKey;
     /**
@@ -80,6 +88,10 @@ public class CarrierInfo extends BaseModel<CarrierInfo> {
      * 卸车磅单
      */
     private String unloadingImg;
+    /**
+     * 卸车照片
+     */
+    private String unloadingJmg;
     /**
      * 卸车净重(吨)
      */
@@ -88,6 +100,31 @@ public class CarrierInfo extends BaseModel<CarrierInfo> {
      * 卸车时间
      */
     private Date unloadingDate;
+    /**
+     * 状态标识（1暂存3提交）
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 装车确认状态
+     */
+    private String loadingConfirm;
+    /**
+     * 装车确认状态标识（1未确认3已确认）
+     */
+    private String loadingConfirmFlag;
+    /**
+     * 卸车确认状态（1未确认3已确认）
+     */
+    private String unloadingConfirm;
+    /**
+     * 卸车确认状态标识（1未确认3已确认）
+     */
+    private String unloadingConfirmFlag;
 
 
     @Override

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

@@ -36,6 +36,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 用户id
      */
     private String commonId;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
     /**
      * 订单编号
      */

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

@@ -12,5 +12,12 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2022-02-16
  */
 public interface ICarrierInfoService extends IService<CarrierInfo> {
-
+    /**
+     * 确认装车
+     */
+    String loadingAdd(CarrierInfo carrierInfo);
+    /**
+     * 确认卸车
+     */
+    String unLoadingAdd(CarrierInfo carrierInfo);
 }

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

@@ -1,10 +1,17 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CarrierInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICarrierInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -16,5 +23,85 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, CarrierInfo> implements ICarrierInfoService {
+    @Autowired
+    private IOrderInfoService orderInfoService;
 
+    /**
+     * 确认装车
+     *
+     * @param carrierInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String loadingAdd(CarrierInfo carrierInfo) {
+        //查询订单
+        OrderInfo orderInfo = orderInfoService.selectById(carrierInfo.getOrderId());
+        //判断暂存提交（前端传参1暂存3提交）
+        if ("1".equals(carrierInfo.getStatusFlag())) {
+            //添加装车信息
+            if(StringUtils.isEmpty(carrierInfo.getId())) {
+                //新增主键id
+                carrierInfo.setId(IdGenerator.generateUUID());
+                carrierInfo.setCompId(orderInfo.getCompId());
+                carrierInfo.setContractNo(orderInfo.getContractNo());
+                carrierInfo.setOrderNo(orderInfo.getOrderNo());
+                carrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+                carrierInfo.setLoadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
+                carrierInfo.setLoadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
+                this.insert(carrierInfo);
+            }
+            //编辑装车信息
+            else {
+                this.updateById(carrierInfo);
+            }
+        }
+        else{
+            //添加装车信息
+            if(StringUtils.isEmpty(carrierInfo.getId())) {
+                //新增主键id
+                carrierInfo.setId(IdGenerator.generateUUID());
+                carrierInfo.setCompId(orderInfo.getCompId());
+                carrierInfo.setContractNo(orderInfo.getContractNo());
+                carrierInfo.setOrderNo(orderInfo.getOrderNo());
+                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                carrierInfo.setLoadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
+                carrierInfo.setLoadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
+                carrierInfo.setLoadingStatus(StatusEnum.LOADING.getName());
+                carrierInfo.setLoadingStatusKey(StatusEnum.LOADING.getFlag());
+                this.insert(carrierInfo);
+            }
+            //编辑装车信息
+            else{
+                this.updateById(carrierInfo);
+            }
+        }
+        return "OK";
+    }
+
+    /**
+     * 确认卸车
+     *
+     * @param carrierInfo
+     * @return
+     */
+    @Override
+    public String unLoadingAdd(CarrierInfo carrierInfo) {
+        //判断暂存提交（前端传参1暂存3提交）
+        if ("1".equals(carrierInfo.getStatusFlag())) {
+            this.updateById(carrierInfo);
+        }
+        else{
+            carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+            carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+            carrierInfo.setUnloadingConfirm(StatusEnum.NOT_LOADING_CONFIRM.getName());
+            carrierInfo.setUnloadingConfirmFlag(StatusEnum.NOT_LOADING_CONFIRM.getFlag());
+            carrierInfo.setUnloadingStatus(StatusEnum.UNLOADING.getName());
+            carrierInfo.setUnloadingStatusKey(StatusEnum.UNLOADING.getFlag());
+            this.updateById(carrierInfo);
+        }
+        return "OK";
+    }
 }