卸货反馈更改状态

pom.xml

@@ -184,7 +184,9 @@
             <properties>
                 <env>local</env>
             </properties>
-
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>dev</id>
@@ -204,9 +206,7 @@
                 <env>prod</env>
             </properties>
 
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
         </profile>
     </profiles>
     <build>

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

@@ -122,10 +122,11 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     public String insertTranCar(TranProcessInfo tranProcessInfo) {
         List<TranCarInfo> tranCarInfoList = tranProcessInfo.getTranCarInfoList();
         if (!CollectionUtils.isEmpty(tranCarInfoList)) {
-            tranCarInfoList.forEach(tranCarInfo -> {
+            for(TranCarInfo tranCarInfo:tranCarInfoList){
                 if(tranCarInfo.getLoadNetWeight()==null){
                     tranCarInfo.setLoadNetWeight(0f);
                 }
+                //新增
                 if (StringUtils.isEmpty(tranCarInfo.getId())) {
                     tranCarInfo.setProcessId(tranProcessInfo.getId());
                     tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
@@ -140,14 +141,22 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                         tranCarInfo.setStatus(StatusEnum.NOT_DELIVERED.getName());
                     }
                     tranCarInfoService.insert(tranCarInfo);
-                } else {
+                }
+                //编辑
+                else {
+                    //非临时司机卸货时未签合同状态
                     if(!NumberConstant.CONSTANT1.equals(tranCarInfo.getTemporaryDriverFlag())&&tranCarInfo.getLoadNetWeight()>0){
                         tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
                         tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
                     }
+                    //卸货时状态改为已送达
+                    if(tranCarInfo.getLoadNetWeight()>0){
+                        tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                        tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                    }
                     tranCarInfoService.updateById(tranCarInfo);
                 }
-            });
+            }
         }
         return tranProcessInfo.getId();
 //        List<TranCarInfo> tranCarInfoList = tranProcessInfo.getTranCarInfoList();