11/22 临时码表不存在去正式码表搜索1.0

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -19,8 +19,7 @@ import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.res.collect.RelCodeDetailResponse;
-import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
-import com.glxp.api.res.inout.VailCodeResultResponse;
+import com.glxp.api.res.inout.*;
 import com.glxp.api.service.collect.*;
 import com.glxp.api.service.collect.RelCodeDetailService;
 import com.glxp.api.service.inout.impl.IoCodeService;
@@ -47,8 +46,6 @@ import com.glxp.api.req.inout.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.basic.UdiRlSupResponse;
-import com.glxp.api.res.inout.AddCodeResult;
-import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.res.inv.InvPlaceDetailResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
@@ -2137,6 +2134,9 @@ public class IoCodeTempController extends BaseController {
 
             }
         }
+        if (list.size() == 0 || list == null){
+            return codeTempService.findCodes(filterCodeRequest);
+        }
         PageInfo<IoCodeTempResponse> pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeTempResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.collect.RelCodeDetail;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
+import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.collect.RelCodeDetailResponse;
 import com.glxp.api.res.inout.IoCodeResponse;
@@ -20,9 +23,7 @@ import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.collect.RelCodeDetailService;
-import com.glxp.api.service.inout.IoOrderDetailBizService;
-import com.glxp.api.service.inout.IoOrderDetailCodeService;
-import com.glxp.api.service.inout.IoOrderService;
+import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.page.PageQuery;
@@ -30,10 +31,13 @@ import com.glxp.api.util.page.TableDataInfo;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.BeanUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -281,4 +285,26 @@ public class IoCodeTempService {
         return ret;
     }
 
+
+
+    @Resource
+    IoCodeService ioCodeService;
+    public BaseResponse findCodes(FilterCodeRequest filterCodeRequest) {
+        List<IoCodeResponse> ioCodeResponses = ioCodeService.filterList(filterCodeRequest);
+        PageInfo<IoCodeResponse> pageInfo = new PageInfo<>(ioCodeResponses);
+        PageSimpleResponse<IoCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(pageInfo.getList());
+//        ArrayList<IoCodeTempResponse> ioCodeTempResponses = new ArrayList<>();
+//        ioCodeTempResponses.addAll(ioCodeResponses.stream()
+//                .map(ioCodeResponse -> convertToIoCodeTempResponse(ioCodeResponse))
+//                .collect(Collectors.toList()));
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+//    public IoCodeTempResponse convertToIoCodeTempResponse(IoCodeResponse response) {
+//        IoCodeTempResponse tempResponse = new IoCodeTempResponse();
+//        BeanUtils.copyProperties(response,tempResponse);
+//        return tempResponse;
+//    }
 }