派车

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

@@ -2,7 +2,6 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
@@ -12,12 +11,14 @@ 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;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -119,31 +120,46 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     @Override
     public String insertTranCar(TranProcessInfo tranProcessInfo) {
         List<TranCarInfo> tranCarInfoList = tranProcessInfo.getTranCarInfoList();
-        List<TranCarInfo> tranCarInfoListTmp = new ArrayList<>();
         if (!CollectionUtils.isEmpty(tranCarInfoList)) {
-            for (TranCarInfo tranCarInfos : tranCarInfoList) {
-                //判断是否有记录
-                if(!StringUtils.isEmpty(tranCarInfos.getId())){
-                    continue;
+            tranCarInfoList.forEach(tranCarInfo -> {
+                if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                    tranCarInfo.setProcessId(tranProcessInfo.getId());
+                    tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
+                    tranCarInfo.setId(IdGenerator.generateUUID());
+                    //汽运类型
+                    if(tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)){
+                        tranCarInfo.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
+                        tranCarInfo.setStatus(StatusEnum.NOT_DELIVERED.getName());
+                    }
+                    tranCarInfoService.insert(tranCarInfo);
+                } else {
+                    tranCarInfoService.updateById(tranCarInfo);
                 }
-                tranCarInfos.setProcessId(tranProcessInfo.getId());
-                tranCarInfos.setInfoId(tranProcessInfo.getInfoId());
-                tranCarInfos.setId(IdGenerator.generateUUID());
-                //汽运类型
-                if(tranCarInfos.getTranType().equals(NumberConstant.CONSTANT1)){
-                    tranCarInfos.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
-                    tranCarInfos.setStatus(StatusEnum.NOT_DELIVERED.getName());
-                }
-                tranCarInfoListTmp.add(tranCarInfos);
-            }
-        }
-        boolean one = tranCarInfoService.insertBatch(tranCarInfoListTmp);
-
-        if(one){
-            return "OK";
-        }else{
-            return "NG";
+            });
         }
+        return tranProcessInfo.getId();
+//        List<TranCarInfo> tranCarInfoList = tranProcessInfo.getTranCarInfoList();
+//        List<TranCarInfo> tranCarInfoListTmp = new ArrayList<>();
+//        if (!CollectionUtils.isEmpty(tranCarInfoList)) {
+//            for (TranCarInfo tranCarInfos : tranCarInfoList) {
+//                //判断是否有记录
+//                if(!StringUtils.isEmpty(tranCarInfos.getId())){
+//                    continue;
+//                }
+//                tranCarInfos.setProcessId(tranProcessInfo.getId());
+//                tranCarInfos.setInfoId(tranProcessInfo.getInfoId());
+//                tranCarInfos.setId(IdGenerator.generateUUID());
+//                //汽运类型
+//                if(tranCarInfos.getTranType().equals(NumberConstant.CONSTANT1)){
+//                    tranCarInfos.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
+//                    tranCarInfos.setStatus(StatusEnum.NOT_DELIVERED.getName());
+//                }
+//                tranCarInfoListTmp.add(tranCarInfos);
+//            }
+//        }
+//        boolean one = tranCarInfoService.insertBatch(tranCarInfoListTmp);
+//
+//
     }
 
     /**