adsa

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -212,7 +212,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 Double saleWeight = tmstruckLeaveFactoryResultMapper.getSaleMaterialWeight(saleOrderId);
                 //判断当前订单是否可出厂
                 Integer canWork = tmstruckLeaveFactoryResultMapper.getCanWorkStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
-                if (allNetWeight + nowNetWeight > saleWeight || canWork != 2) {
+                if (allNetWeight + nowNetWeight > saleWeight || (canWork != null && canWork != 2)) {
                     throw new Exception("该销售订单吨位已超额，不允许出厂，请提醒司机走流程卸货！");
                 }
             }