铲车和门卫

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtGatekeeperWaybillOrder.java

@@ -38,6 +38,11 @@ public class KwtGatekeeperWaybillOrder implements Serializable {
      */
     private Long wOrderId;
 
+    /**
+     * 物流运单编号
+     */
+    private String wOrderNo;
+
     /**
      * 物流订单id
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/reponse/ForkliftOrderResp.java

@@ -30,7 +30,7 @@ public class ForkliftOrderResp implements Serializable {
      * 铲车订单编号
      */
     @Schema(description = "铲车订单编号")
-    private String fOrderNo;
+    private String forkliftOrderNo;
 
     /**
      * 企业id
@@ -42,13 +42,13 @@ public class ForkliftOrderResp implements Serializable {
      * 物流运单id
      */
     @Schema(description = "物流运单id")
-    private Long wOrderId;
+    private Long waybillOrderId;
 
     /**
      * 物流订单id
      */
     @Schema(description = "物流订单id")
-    private Long lOrderId;
+    private Long logisticsOrderId;
 
     /**
      * 装载类型（0装载，1补货）
@@ -57,9 +57,9 @@ public class ForkliftOrderResp implements Serializable {
     private Integer loadingType;
 
     /**
-     * 状态（1接单，5-已接单、10-已装载）
+     * 状态（1-待接单，5-已接单、10-已装载）
      */
-    @Schema(description = "状态（1接单，5-已接单、10-已装载）")
+    @Schema(description = "状态（1-待接单，5-已接单、10-已装载）")
     private Integer status;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/reponse/GatekeeperOrderResp.java

@@ -30,7 +30,7 @@ public class GatekeeperOrderResp implements Serializable {
      * 运单编号
      */
     @Schema(description = "运单编号")
-    private String wOrderNo;
+    private String  waybillOrderNo;
 
     /**
      * 企业id
@@ -42,13 +42,13 @@ public class GatekeeperOrderResp implements Serializable {
      * 物流运单id
      */
     @Schema(description = "物流运单id")
-    private Long wOrderId;
+    private Long waybillOrderId;
 
     /**
      * 物流订单id
      */
     @Schema(description = "物流订单id")
-    private Long lOrderId;
+    private Long logisticsOrderId;
 
     /**
      * 状态（1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/request/ForkliftOrderQueryParam.java

@@ -42,7 +42,6 @@ public class ForkliftOrderQueryParam extends PageReq implements Serializable {
     /**
      * 状态
      */
-    @NotNull(message = "状态不能为空，")
     @Schema(description = "状态 （1-待接单，5-进行中，10-已装载）")
     private Integer status;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/ForkliftOrderService.java

@@ -202,10 +202,10 @@ public class ForkliftOrderService {
                                                      Map<String, OrderUnitInfoDetailVO> tradeOrderAndUnit) {
         ForkliftOrderResp forklift = new ForkliftOrderResp();
         forklift.setId(forkliftOrder.getId());
-        forklift.setFOrderNo(forkliftOrder.getFOrderNo());
+        forklift.setForkliftOrderNo(forkliftOrder.getFOrderNo());
         forklift.setEntId(forkliftOrder.getEntId());
-        forklift.setWOrderId(forkliftOrder.getWOrderId());
-        forklift.setLOrderId(forkliftOrder.getLOrderId());
+        forklift.setWaybillOrderId(forkliftOrder.getWOrderId());
+        forklift.setLogisticsOrderId(forkliftOrder.getLOrderId());
         forklift.setLoadingType(forkliftOrder.getLoadingType());
         forklift.setStatus(forkliftOrder.getStatus());
         forklift.setDriverId(forkliftOrder.getDriverId());
@@ -264,7 +264,7 @@ public class ForkliftOrderService {
 
         LambdaQueryWrapper<KwtForkliftWaybillOrder> queryWrapper = Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
                 .eq(KwtForkliftWaybillOrder::getDriverId, param.getDriverId())
-                .eq(KwtForkliftWaybillOrder::getStatus, param.getStatus())
+                .eq( param.getStatus() != null, KwtForkliftWaybillOrder::getStatus, param.getStatus())
                 .orderByDesc(KwtForkliftWaybillOrder::getCreateTime)
                 .orderByDesc(KwtForkliftWaybillOrder::getId);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -207,8 +207,9 @@ public class GatekeeperOrderService {
         GatekeeperOrderResp gatekeeper = new GatekeeperOrderResp();
         gatekeeper.setId(gatekeeperWaybillOrder.getId());
         gatekeeper.setEntId(gatekeeperWaybillOrder.getEntId());
-        gatekeeper.setWOrderId(gatekeeperWaybillOrder.getWOrderId());
-        gatekeeper.setLOrderId(gatekeeperWaybillOrder.getLOrderId());
+        gatekeeper.setWaybillOrderNo(gatekeeperWaybillOrder.getWOrderNo());
+        gatekeeper.setWaybillOrderId(gatekeeperWaybillOrder.getWOrderId());
+        gatekeeper.setLogisticsOrderId(gatekeeperWaybillOrder.getLOrderId());
         gatekeeper.setStatus(gatekeeperWaybillOrder.getStatus());
         gatekeeper.setCarAxisName(gatekeeperWaybillOrder.getCarAxis());
         gatekeeper.setLegalLoad(gatekeeper.getLegalLoad());