1.商品查询 list->one

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1299,11 +1299,15 @@ public class KwpGoodsService {
     }
 
     public com.sckw.product.api.model.KwpGoods getGoodsByGoodsName(String goodsName) {
-        KwpGoods kwpGoods = kwpGoodsMapper.selectOne(
-                new LambdaQueryWrapper<KwpGoods>().eq(KwpGoods::getName, goodsName).eq(KwpGoods::getDelFlag, 0));
+        List<KwpGoods> kwpGoods = kwpGoodsMapper.selectList(
+                new LambdaQueryWrapper<KwpGoods>().eq(KwpGoods::getName, goodsName)
+                        .eq(KwpGoods::getDelFlag, 0)
+                        .orderByDesc(KwpGoods::getCreateTime)
+        );
         com.sckw.product.api.model.KwpGoods goods = new com.sckw.product.api.model.KwpGoods();
-        if (kwpGoods != null) {
-            org.springframework.beans.BeanUtils.copyProperties(kwpGoods, goods);
+        if (kwpGoods.size() > 0) {
+            KwpGoods kwpGoods1 = kwpGoods.get(0);
+            org.springframework.beans.BeanUtils.copyProperties(kwpGoods1, goods);
         }
         return goods;
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/Import/KwtAcceptCarriageOrderImportService.java

@@ -557,12 +557,13 @@ public class KwtAcceptCarriageOrderImportService {
 
     /**
      * 按照装卸货地址类型 存储地址
+     *
      * @param addressRes
      * @param lOrderId
      * @param loadAddressName
      * @param unloadAddressName
      */
-    private void insertOrderAddress(List<EntAddressResDto> addressRes,Long lOrderId, String loadAddressName,String unloadAddressName) {
+    private void insertOrderAddress(List<EntAddressResDto> addressRes, Long lOrderId, String loadAddressName, String unloadAddressName) {
         Map<Integer, List<EntAddressResDto>> collect = addressRes.stream().collect(Collectors.groupingBy(EntAddressResDto::getDefaultType));
         List<EntAddressResDto> loadAddressRes = collect.get(AddressDefaultTypeEnum.SHIPMENT.getCode());
         Map<String, EntAddressResDto> loadAddressMap = new HashMap<>();
@@ -787,7 +788,7 @@ public class KwtAcceptCarriageOrderImportService {
 
             String goodsName = excelImport.getGoodsName().trim();
             KwpGoods goods = goodsInfoService.getGoodsByGoodsName(goodsName);
-            if (goods == null) {
+            if (goods == null || goods.getId() == null) {
                 throw new RuntimeException("第" + number + "行货物信息不存在");
             }
             String goodsModelType = excelImport.getGoodsModel().trim();