APP反馈

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

@@ -63,6 +63,15 @@ public class TranCarInfoController {
     public void deleteTranCar(@RequestBody TranCarInfo example) {
         tranCarInfoService.deleteTranCar(example.getId());
     }
+    /**
+     * APP反馈
+     * @param tranCarInfo
+     * @return
+     */
+    @PostMapping("/api/feedbackTranCar")
+    public String feedbackTranCar(@RequestBody TranCarInfo tranCarInfo) {
+        return tranCarInfoService.feedbackTranCar(tranCarInfo);
+    }
 
 }
 

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

@@ -219,7 +219,11 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      */
     @TableField(exist = false)
     private String planId;
-
+    /**
+     * flag(0暂存1提交)
+     */
+    @TableField(exist = false)
+    private String flag;
 
     @TableField(exist = false)
     private List<DriverViewInfo> driverViewInfoList;

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

@@ -39,6 +39,12 @@ public interface ITranCarInfoService extends IService<TranCarInfo> {
      * @param id
      */
     void deleteTranCar(String id);
+    /**
+     * APP反馈
+     *
+     * @param tranCarInfo
+     */
+    String feedbackTranCar(TranCarInfo tranCarInfo);
 
 
 }

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

@@ -10,6 +10,7 @@ import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -203,6 +204,45 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
         }
     }
 
+    /**
+     * APP反馈
+     * @param tranCarInfo
+     * @return
+     */
+    @Override
+    public String feedbackTranCar(TranCarInfo tranCarInfo) {
+        //新增
+        if (StringUtils.isEmpty(tranCarInfo.getId())) {
+            tranCarInfo.setId(IdGenerator.generateUUID());
+            //保存
+            if ("0".equals(tranCarInfo.getFlag())){
+                tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
+                tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
+            }
+            //提交
+            else {
+                tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+            }
+            this.insert(tranCarInfo);
+        }
+        else {
+            if ("1".equals(tranCarInfo.getFlag())){
+                //卸车反馈时状态改为已送达
+                if (tranCarInfo.getUnloadNetWeight() > 0) {
+                    tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                    tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                }
+                else {
+                    tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                    tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                }
+            }
+            this.updateById(tranCarInfo);
+        }
+        return tranCarInfo.getId();
+    }
+
     /**
      * 任务
      *