放开超载

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CarWaybillV1Enum.java

@@ -84,9 +84,9 @@ public enum CarWaybillV1Enum {
      */
     UNLOADING_WAIT_RELEASE(21, "卸货待放行"),
 
-//    /**
-//     * 卸货已放行待离场 (只有友盛在用)  弃用
-//     */
+    /**
+     * 卸货已放行待离场 (只有友盛在用)  弃用
+     */
 //    UNLOADING_RELEASED_WAIT_LEAVE(22, "卸货已放行待离场"),
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -175,7 +175,7 @@ public class TransportServiceImpl implements TransportRemoteService {
             CarWaybillV1Enum.UNLOADING_POINT.getCode(),
             CarWaybillV1Enum.UNLOADING_WAIT_LEAVE.getCode(),
             CarWaybillV1Enum.UNLOADING_WAIT_RELEASE.getCode(),
-            CarWaybillV1Enum.UNLOADING_RELEASED_WAIT_LEAVE.getCode(),
+//            CarWaybillV1Enum.UNLOADING_RELEASED_WAIT_LEAVE.getCode(),
 
             CarWaybillV1Enum.REVIEW_REJECTION.getCode()
     );

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -330,11 +330,11 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 return;
             }
 
-//            // 场景三：超载流程, 净重>任务量或者毛重>法定载重
-//            if (loadAmount.compareTo(entrustAmount) > 0 || param.getWeighAmount().compareTo(truckStandardLoad) > 0) {
-//                waybillOrder.setTargetStatus(3);
-//                return;
-//            }
+            // 场景三：超载流程, 净重>任务量或者毛重>法定载重
+            if (loadAmount.compareTo(entrustAmount) > 0 || param.getWeighAmount().compareTo(truckStandardLoad) > 0) {
+                waybillOrder.setTargetStatus(3);
+                return;
+            }
             // 场景四：正常流程,0.5<净重<=任务量
             waybillOrder.setTargetStatus(2);
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/WaybillTimelinePhaseEnum.java

@@ -36,8 +36,8 @@ public enum WaybillTimelinePhaseEnum {
                     CarWaybillV1Enum.WAIT_LOADING,
                     CarWaybillV1Enum.UNLOADING_POINT,
                     CarWaybillV1Enum.UNLOADING_WAIT_LEAVE,
-                    CarWaybillV1Enum.UNLOADING_WAIT_RELEASE,
-                    CarWaybillV1Enum.UNLOADING_RELEASED_WAIT_LEAVE
+                    CarWaybillV1Enum.UNLOADING_WAIT_RELEASE
+//                    CarWaybillV1Enum.UNLOADING_RELEASED_WAIT_LEAVE
             )),
 
     UNLOADED(25, "已卸货",