提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -34,6 +34,7 @@ import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -75,11 +76,9 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
     @Override
     public Page<JdBackVo> getPage(JdBackSelectDto dto) {
         IWrapper<JdBack> wrapper = getWrapper();
-//        wrapper.keyword(dto.getKeyword(),
-//                new SqlField("jb", JdBackVo::getLogisticsCode),
-//                new SqlField("jbd.product_code"),
-//                new SqlField("jbd.product_name")
-//        );
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("jb", JdBackVo::getReturnId)
+        );
 //        wrapper.eq("jb", JdBackVo::getType, dto.getType());
 //        wrapper.eq("jb", JdBackVo::getStatus, dto.getStatus());
         wrapper.eq("jb", JdBackVo::getReturnStateName, dto.getReturnStateName());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -875,6 +875,20 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         }
         List<String> collect = new ArrayList<>(list.get(0).values());
         collect.remove(0);
+
+        if (!collect.isEmpty()) {
+            List<StockWait> stockWaitList = stockWaitService.list(q -> q.in(StockWait::getBusinessCode, collect));
+            List<String> businessCodeList = stockWaitList.stream().map(StockWait::getBusinessCode).collect(Collectors.toList());
+
+            String notCodeJoined = collect.stream()
+                    .filter(item -> !businessCodeList.contains(item))
+                    .collect(Collectors.joining(","));
+
+            if (ObjectUtil.isNotEmpty(notCodeJoined)) {
+                throw new ServiceException("未匹配到相关订单：" + notCodeJoined);
+            }
+        }
+
         return collect;
     }
 

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java

@@ -4,7 +4,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.IssueImportExcelBo;
-import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
@@ -39,9 +38,6 @@ public class StockWaitController {
     @Autowired
     private StockWaitService stockWaitService;
 
-    @Autowired
-    private ProductInfoService productInfoService;
-
     /**
      * 待出入库分页
      */
@@ -90,7 +86,6 @@ public class StockWaitController {
         stockWaitService.addByWdly(stockWaitDto);
     }
 
-
     /**
      * 待出入库编辑
      */