铲车联调

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/AbstractWaybillOrderHandler.java

@@ -58,6 +58,8 @@ public abstract class AbstractWaybillOrderHandler<T extends WaybillOrderProcessP
     protected KwtLogisticsOrderCirculateRepository logisticsOrderCirculateRepository;
     @Autowired
     protected KwtLogisticsOrderUnitRepository logisticsOrderUnitRepository;
+    @Autowired
+    protected KwtLogisticsOrderGoodsRepository logisticsOrderGoodsRepository;
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     protected RemoteFleetService remoteFleetService;

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

@@ -2,6 +2,7 @@ package com.sckw.transport.handler;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
@@ -11,11 +12,13 @@ import com.sckw.core.utils.DateUtils;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
+import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.WaybillOrderCmeIntoWeighParam;
 import com.sckw.transport.repository.KwtForkliftWaybillOrderRepository;
-import com.sckw.transport.repository.KwtWaybillOrderTicketRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,12 +40,12 @@ import java.util.stream.Collectors;
 @Service
 public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCmeIntoWeighParam> {
 
-    @Autowired
-    private KwtWaybillOrderTicketRepository waybillOrderTicketRepository;
-
     @Autowired
     private KwtForkliftWaybillOrderRepository forkliftWaybillOrderRepository;
 
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private RemoteSystemService remoteSystemService;
+
 
     @Override
     protected KwtWaybillOrder getWaybillOrder(WaybillOrderCmeIntoWeighParam param) {
@@ -92,12 +95,22 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 forklift.setEntId(waybillOrder.getEntId());
                 forklift.setWOrderId(waybillOrder.getId());
                 forklift.setLOrderId(waybillOrder.getLOrderId());
+
+                // 查询商品信息
+                KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
+                if (orderGoods != null) {
+                    List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), orderGoods.getGoodsType());
+                    forklift.setDictId(CollectionUtils.isNotEmpty(dictResDtoList) ? dictResDtoList.get(0).getId() : -1L);
+                    forklift.setGoodsId(orderGoods.getGoodsId());
+                    forklift.setGoodsName(orderGoods.getGoodsName());
+                }
                 forklift.setLoadingType(0);
                 forklift.setStatus(ForkliftStatusEnum.PENDING_ORDERS.getCode());
                 forklift.setDriverId(waybillOrder.getDriverId());
                 forklift.setDriverName(waybillOrder.getDriverName());
                 forklift.setDriverPhone(waybillOrder.getDriverPhone());
                 forklift.setWaybillAcceptTime(waybillOrder.getCreateTime());
+
                 // 任务量
                 KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
                 forklift.setEntrustAmount(waybillSubtask.getEntrustAmount());
@@ -107,6 +120,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                     forklift.setTruckType(truckVo.getTruckType());
                     forklift.setCarAxis(truckVo.getCarAxis());
                 }
+                forklift.setCreateTime(new Date());
                 forklift.setCreateUser(waybillOrder.getDriverId());
                 forklift.setUpdateUser(waybillOrder.getDriverId());
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -140,15 +140,21 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
         gatekeeper.setEntId(waybillOrder.getEntId());
         gatekeeper.setWOrderId(waybillOrder.getId());
+        gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
         gatekeeper.setLOrderId(waybillOrder.getLOrderId());
-        gatekeeper.setGoodsId(11111L);
-        gatekeeper.setGoodsName("测试");
+        // 查询商品信息
+        KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
+        if (orderGoods != null) {
+            gatekeeper.setGoodsId(orderGoods.getGoodsId());
+            gatekeeper.setGoodsName(orderGoods.getGoodsName());
+        }
         gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
         gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
-        gatekeeper.setEntrustAmount(truckLoadVolume);
         gatekeeper.setTruckType(truck.getTruckType());
+        gatekeeper.setEntrustAmount(truckLoadVolume);
         gatekeeper.setCarAxis(truck.getCarAxis());
         gatekeeper.setLegalLoad(truck.getLegalLoad());
+        gatekeeper.setCreateTime(new Date());
         gatekeeper.setCreateUser(waybillOrder.getDriverId());
         gatekeeper.setUpdateUser(waybillOrder.getDriverId());