diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/OrderTransQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/OrderTransQueryParam.java index 784f639..5085c33 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/OrderTransQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/OrderTransQueryParam.java @@ -1,5 +1,6 @@ package com.njzscloud.dispose.cst.order.pojo.param; +import com.njzscloud.dispose.cst.order.constant.CheckStatus; import com.njzscloud.dispose.cst.order.constant.OrderStatus; import com.njzscloud.dispose.cst.order.constant.TransStatus; import lombok.Getter; @@ -64,5 +65,10 @@ public class OrderTransQueryParam { */ private TransStatus transStatus; + /** + * 勘料状态;字典代码:check_status,Wu-->无需勘料、YiKanLiao-->已勘料、WeiKanLiao-->未勘料 + */ + private CheckStatus checkStatus; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java index af0520d..1bce6f1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java @@ -325,12 +325,13 @@ public class OrderService extends ServiceImpl { // 根据订单类型区分毛重皮重 if (OrderCategory.HuiShouYuYue.equals(result.getOrderCategory())) { transEntity.setTareWeight(weight); + transEntity.setSettleWeight(result.getRoughWeight() - transEntity.getTareWeight()); // 更新车辆皮重 this.updateTruckHisTareWeight(result.getTruckId(), weight); } else if (OrderCategory.XiaoShouYuYue.equals(result.getOrderCategory())) { transEntity.setRoughWeight(weight); + transEntity.setSettleWeight(transEntity.getRoughWeight() - result.getTareWeight()); } - transEntity.setSettleWeight(transEntity.getRoughWeight() - transEntity.getTareWeight()); transEntity.setOutFrontPhoto(leavingParam.getFrontPhoto()); transEntity.setOutBodyPhoto(leavingParam.getBodyPhoto()); transEntity.setOutTime(LocalDateTime.now()); diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderTransService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderTransService.java index 2957d12..59c3305 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderTransService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderTransService.java @@ -69,27 +69,37 @@ public class OrderTransService extends ServiceImpl