修改

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

@@ -34,8 +34,10 @@ public enum StatusEnum {
 
 
     //汽运状态
-    DELIVERED("1","已送达","delivered"),
-    NOT_DELIVERED("3","未送达","not_delivered"),
+    NOT_DELIVERED("1","未送达",""),
+    NOT_LOADED("2","未装车","not_loaded"),
+    LOADED("3","已装车","loaded"),
+    DELIVERED("5","已送达","delivered"),
 
     //运输管理状态
     TRAN_DO("1", "执行中", "Under implementation"),

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.TranProcessInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
@@ -54,6 +55,14 @@ public class TranCarInfoController {
     public List<TranCarInfo> selectTranCarInfoNum(TranCarInfo tranCarInfo){
         return tranCarInfoService.selectTranCarInfoNum(tranCarInfo);
     }
+    /**
+     * 删除车辆
+     * @param example
+     */
+    @PostMapping("/api/deleteTranCar")
+    public void deleteTranCar(@RequestBody TranCarInfo example) {
+        tranCarInfoService.deleteTranCar(example.getId());
+    }
 
 }
 

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

@@ -75,5 +75,12 @@ public class TranProcessInfoController {
     public void deleteTranProcess(@RequestBody TranProcessInfo example) {
         tranProcessInfoService.deleteTranProcess(example.getId());
     }
+    /**
+     * 设置运输金额
+     */
+    @PostMapping("/api/setUpTranPrice")
+    public String setUpTranPrice(@RequestBody TranProcessInfo tranProcessInfo){
+        return tranProcessInfoService.setUpTranPrice(tranProcessInfo);
+    }
 }
 

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

@@ -235,6 +235,12 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
 
+    /**
+     * 运输单价标识(1提交2审核)
+     */
+    @TableField(exist = false)
+    private String flag;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -33,6 +33,12 @@ public interface ITranCarInfoService extends IService<TranCarInfo> {
      * @param tranCarInfo
      */
     List<TranCarInfo> selectTranCarInfoNum(TranCarInfo tranCarInfo);
+    /**
+     * 删除运输车辆
+     *
+     * @param id
+     */
+    void deleteTranCar(String id);
 
 
 }

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

@@ -57,5 +57,11 @@ public interface ITranProcessInfoService extends IService<TranProcessInfo> {
      * @param id
      */
     void deleteTranProcess(String id);
+    /**
+     * 设置运输价格
+     * @param tranProcessInfo
+     * @return
+     */
+    String setUpTranPrice(TranProcessInfo tranProcessInfo);
 
 }

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

@@ -168,4 +168,17 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
                 .orderBy("tran_car_no", true));
         return tranCarInfoList;
     }
+
+    /**
+     *
+     * 删除车辆
+     * @param id
+     */
+    @Override
+    public void deleteTranCar(String id) {
+        TranCarInfo tranCarInfo= this.selectById(id);
+        if (tranCarInfo!=null){
+            this.deleteById(tranCarInfo.getId());
+        }
+    }
 }

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

@@ -137,8 +137,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     }
                     //汽运类型
                     if(tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)){
-                        tranCarInfo.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
-                        tranCarInfo.setStatus(StatusEnum.NOT_DELIVERED.getName());
+                        tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
+                        tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
                     }
                     tranCarInfoService.insert(tranCarInfo);
                 }
@@ -149,8 +149,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                         tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
                         tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
                     }
-                    //卸货时状态改为已送达
+                    //装车反馈时状态改为已装车
                     if(tranCarInfo.getLoadNetWeight()>0){
+                        tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                        tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                    }
+                    //卸车反馈时状态改为已送达
+                    if(tranCarInfo.getUnloadNetWeight()>0){
                         tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                     }
@@ -221,4 +226,24 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             this.deleteById(tranProcessInfo.getId());
         }
     }
+    /**
+     * 设置运输价格
+     * @param tranProcessInfo
+     * @return
+     */
+    @Override
+    public String setUpTranPrice(TranProcessInfo tranProcessInfo) {
+        //物流部提交
+        if ("1".equals(tranProcessInfo.getFlag())){
+            tranProcessInfo.setPriceStatus("审核中");
+        }
+        //决策人审核
+        else {
+            tranProcessInfo.setTranPrice(tranProcessInfo.getTranPriceIng());
+            tranProcessInfo.setTranPriceIng(0.0f);
+            tranProcessInfo.setPriceStatus("已通过");
+        }
+        this.updateById(tranProcessInfo);
+        return "ok";
+    }
 }