|
|
@@ -332,10 +332,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
//法定载重
|
|
|
BigDecimal truckStandardLoad = getTruckStandardLoad(param.getTruckNo());
|
|
|
// 场景三:超载流程, 净重>任务量或者毛重>法定载重
|
|
|
- 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);
|
|
|
@@ -373,7 +373,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
|
|
|
status = switch (waybillOrder.getTargetStatus()) {
|
|
|
case 1 -> CarWaybillV1Enum.EMPTY_WAIT_LEAVE.getCode();
|
|
|
case 2 -> CarWaybillV1Enum.WAIT_LEAVE.getCode();
|
|
|
- case 3 -> CarWaybillV1Enum.UNLOADING.getCode();
|
|
|
+// case 3 -> CarWaybillV1Enum.UNLOADING.getCode();
|
|
|
default -> -1;
|
|
|
};
|
|
|
}
|