1、单证编辑前置条件调整;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -1618,11 +1618,19 @@ public class KwtWaybillOrderService {
         if (ticket == null) {
             return HttpResult.error("车辆运单榜单信息不存在！");
         }
+        if (params.getType() == Global.NUMERICAL_ONE && (waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_LOADING.getCode()
+                && waybillOrder.getStatus() != CarWaybillEnum.WAIT_UNLOADING.getCode()
+                && waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_UNLOADING.getCode())) {
+            return HttpResult.error("当前运单不能编辑装货榜单！");
+        }
+        if (params.getType() == Global.NUMERICAL_TWO && waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_UNLOADING.getCode()) {
+            return HttpResult.error("当前运单不能编辑卸货榜单！");
+        }
 
         /**2更新车辆运单信息**/
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
-        waybillOrder.setLoadAmount(params.getType() == 1 ? params.getAmount() : waybillOrder.getLoadAmount());
-        waybillOrder.setUnloadAmount(params.getType() == 2 ? params.getAmount() : waybillOrder.getUnloadAmount());
+        waybillOrder.setLoadAmount(params.getType() == Global.NUMERICAL_ONE ? params.getAmount() : waybillOrder.getLoadAmount());
+        waybillOrder.setUnloadAmount(params.getType() == Global.NUMERICAL_TWO ? params.getAmount() : waybillOrder.getUnloadAmount());
         waybillOrder.setDeficitAmount(waybillOrder.getLoadAmount().subtract(waybillOrder.getUnloadAmount()));
         BigDecimal deficitPrice = deficitPrice(waybillOrder.getLoadAmount(), waybillOrder.getDeficitAmount(),
                 logisticsOrder.getLoss(), logisticsOrder.getGoodsPrice());
@@ -1638,14 +1646,14 @@ public class KwtWaybillOrderService {
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(waybillOrder.getLoadAmount());
-        wOrder.setLoadTime(params.getType() == 1 ? params.getOperateTime() : null);
-        wOrder.setUnloadUrls(params.getType() == 1 ? params.getUrls() : null);
+        wOrder.setLoadTime(params.getType() == Global.NUMERICAL_ONE ? params.getOperateTime() : null);
+        wOrder.setUnloadUrls(params.getType() == Global.NUMERICAL_ONE ? params.getUrls() : null);
         wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
-        wOrder.setUnloadTime(params.getType() == 2 ? params.getOperateTime() : null);
-        wOrder.setLoadUrls(params.getType() == 2 ? params.getUrls() : null);
+        wOrder.setUnloadTime(params.getType() == Global.NUMERICAL_TWO ? params.getOperateTime() : null);
+        wOrder.setLoadUrls(params.getType() == Global.NUMERICAL_TWO ? params.getUrls() : null);
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
-        editSckwWaybillOrder(wOrder, waybillOrder, 2);
+        editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
 
         //2承运订单
         /*SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
@@ -1756,7 +1764,7 @@ public class KwtWaybillOrderService {
             /**5更新承运订单信息**/
             Map queryParams = new HashMap();
             queryParams.put("lOrderId", waybillOrder.getLOrderId());
-            queryParams.put("passStatus", 1);
+            queryParams.put("passStatus", Global.NUMERICAL_ONE);
             WaybillCountVo waybillCount = waybillOrderDao.findWaybillOrderCount(queryParams);
 
             //更新卸货量/卸货时间/亏吨/亏吨扣款
@@ -1790,7 +1798,7 @@ public class KwtWaybillOrderService {
         //1车辆运单
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(waybillOrder.getId());
-        editSckwWaybillOrder(wOrder, waybillOrder, 2);
+        editSckwWaybillOrder(wOrder, waybillOrder, Global.NUMERICAL_TWO);
 
         /**8发送消息**/