Răsfoiți Sursa

过磅记录新增过磅类型

donglang 1 lună în urmă
părinte
comite
c7a9934c54

+ 2 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -19,6 +19,7 @@ import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.*;
+import com.sckw.transport.model.enuma.WeighbridgeTypeEnum;
 import com.sckw.transport.model.param.WaybillOrderCmeIntoWeighParam;
 import com.sckw.transport.model.param.WaybillOrderCmeIntoWeighParam;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -208,6 +209,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 weighbridge.setLOrderId(waybillOrder.getLOrderId());
                 weighbridge.setLOrderId(waybillOrder.getLOrderId());
                 weighbridge.setTruckId(waybillOrder.getTruckId());
                 weighbridge.setTruckId(waybillOrder.getTruckId());
                 weighbridge.setTruckNo(waybillOrder.getTruckNo());
                 weighbridge.setTruckNo(waybillOrder.getTruckNo());
+                weighbridge.setType(WeighbridgeTypeEnum.LOADING.getCode());
                 weighbridge.setWeighbridgeId(10001l);
                 weighbridge.setWeighbridgeId(10001l);
                 weighbridge.setWeight(BigDecimal.ZERO);
                 weighbridge.setWeight(BigDecimal.ZERO);
                 weighbridge.setWeighUrl(null);
                 weighbridge.setWeighUrl(null);

+ 5 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderWeighbridge.java

@@ -46,6 +46,11 @@ public class KwtWaybillOrderWeighbridge implements Serializable {
      */
      */
     private String truckNo;
     private String truckNo;
 
 
+    /**
+     * 过磅类型
+     */
+    private Integer type;
+
     /**
     /**
      * 地磅id
      * 地磅id
      */
      */

+ 40 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/WeighbridgeTypeEnum.java

@@ -0,0 +1,40 @@
+package com.sckw.transport.model.enuma;
+
+import lombok.Getter;
+
+/**
+ * @author zk
+ * @desc 装卸货类型
+ * @date 2024/3/8 0008
+ */
+@Getter
+public enum WeighbridgeTypeEnum {
+
+    /**
+     * 装货
+     */
+    LOADING(1, "装货"),
+
+    /**
+     * 卸货
+     */
+    UNLOADING(2, "卸货");
+
+
+    private final Integer code;
+    private final String name;
+
+    WeighbridgeTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getName(Integer code) {
+        for (WeighbridgeTypeEnum entity : WeighbridgeTypeEnum.values()) {
+            if (entity.getCode().equals(code)) {
+                return entity.getName();
+            }
+        }
+        return null;
+    }
+}

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderWeighbridgeRepository.java

@@ -22,6 +22,7 @@ public class KwtWaybillOrderWeighbridgeRepository extends ServiceImpl<KwtWaybill
         return list(
         return list(
                 Wrappers.<KwtWaybillOrderWeighbridge>lambdaQuery()
                 Wrappers.<KwtWaybillOrderWeighbridge>lambdaQuery()
                         .eq(KwtWaybillOrderWeighbridge::getWOrderId, wOrderId)
                         .eq(KwtWaybillOrderWeighbridge::getWOrderId, wOrderId)
+                        .eq(KwtWaybillOrderWeighbridge::getType, 1)
                         .orderByDesc(KwtWaybillOrderWeighbridge::getId));
                         .orderByDesc(KwtWaybillOrderWeighbridge::getId));
     }
     }