bug修复

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckSaveParam.java

@@ -71,7 +71,6 @@ public class TruckSaveParam implements Serializable {
     /**
      * 排放标准(1-国四、2-国五、3-国六)
      */
-    @NotNull(message = "排放标准不能为空")
     @Schema(description = "排放标准(1-国四、2-国五、3-国六)")
     private Integer eev;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2205,6 +2205,11 @@ public class KwfTruckService {
      */
     public void saveTruck(TruckSaveParam param) {
         log.info("保存车辆，id：{}", JSON.toJSONString(param));
+        if (Objects.equals(param.getEnergyType(), TruckEnergyTypeEnum.TRADITIONAL.getCode())) {
+            if (param.getEev() == null) {
+                throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "传统能源车辆的排放标准不能为空！");
+            }
+        }
 
         // 新增
         if (param.getId() == null) {

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

@@ -145,7 +145,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
                 KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
                 if (goods != null) {
-                    List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), orderGoods.getGoodsType());
+                    List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.GOODS_SPEC.getType(), goods.getSpec());
                     forklift.setDictId(CollectionUtils.isNotEmpty(dictResDtoList) ? dictResDtoList.get(0).getId() : -1L);
                     forklift.setGoodsId(goods.getId());
                     forklift.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));

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

@@ -76,7 +76,7 @@ public class ReplenishHandler extends AbstractWaybillOrderHandler<WaybillOrderRe
                 KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
                 KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
                 if (goods != null) {
-                    List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), orderGoods.getGoodsType());
+                    List<SysDictResDto> dictResDtoList = remoteSystemService.queryDictFrontAll(DictTypeEnum.GOODS_SPEC.getType(), goods.getSpec());
                     forklift.setDictId(CollectionUtils.isNotEmpty(dictResDtoList) ? dictResDtoList.get(0).getId() : -1L);
                     forklift.setGoodsId(goods.getId());
                     forklift.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));

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

@@ -390,7 +390,7 @@ public class ForkliftOrderService {
         }
 
         // 2.提取商goods_type
-        Set<String> goodsTypeSet = goodsList.stream().map(KwpGoods::getGoodsType).filter(Objects::nonNull).collect(Collectors.toSet());
+        List<String> goodsTypeSet = goodsList.stream().map(KwpGoods::getGoodsType).filter(Objects::nonNull).collect(Collectors.toList());
 
         // 3.查询出所有商品类型的字典数据
         List<SysDictResDto> allTypeDictList = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());