feat: 产品记录页面

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

@@ -36,10 +36,7 @@ import com.glxp.api.req.system.DeleteRequest;
 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.IoOrderDetailBizResponse;
+import com.glxp.api.res.inout.*;
-import com.glxp.api.res.inout.IoOrderDetailResultResponse;
-import com.glxp.api.res.inout.IoOrderInvoiceResponse;
-import com.glxp.api.res.inout.IoSplitCodeResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.*;
@@ -665,8 +662,51 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/finishbizDetail/filterList")
     public BaseResponse finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest) {
-        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.finishBizDetail(finishBizRequest);
+        FilterOrderDetailBizRequest orderDetailBizRequest = new FilterOrderDetailBizRequest();
-        PageInfo<IoOrderDetailCodeEntity> pageInfo = new PageInfo<>(orderDetailCodeEntities);
+        String action = finishBizRequest.getAction();
+        String startTime = finishBizRequest.getStartTime();
+        String endTime = finishBizRequest.getEndTime();
+        String billNo = finishBizRequest.getBillNo();
+
+        FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
+        filterOrderRequest.setAction(action);
+        List<String> actions = new ArrayList<>();
+        actions.add(ConstantType.SPLIT_OUT);
+        actions.add(ConstantType.SPLIT_RETURN);
+        filterOrderRequest.setActions(actions);
+        filterOrderRequest.setStartTime(startTime);
+        filterOrderRequest.setEndTime(endTime);
+        filterOrderRequest.setBillNo(billNo);
+        List<IoOrderResponse> ioOrderResponses = orderService.getfilterOrderList(filterOrderRequest);
+        if (CollUtil.isEmpty(ioOrderResponses)){
+            PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(ioOrderResponses);
+            return ResultVOUtils.page(pageInfo);
+        }
+        List<String> orders = ioOrderResponses.stream().map(IoOrderResponse::getBillNo).collect(Collectors.toList());
+        orderDetailBizRequest.setOrderIdFks(orders);
+
+
+
+        orderDetailBizRequest.setLimit(finishBizRequest.getLimit());
+        orderDetailBizRequest.setPage(finishBizRequest.getPage());
+        orderDetailBizRequest.setKeyWords(finishBizRequest.getKeyWords());
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+
+//        String value = systemParamConfigService.selectValueByParamKey("order_detail_visible");
+//        if (IntUtil.value(value) == 1) {
+//            list = list.stream()
+//                    .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode))
+//                    .collect(Collectors.toList());
+//        }
+//        if (CollUtil.isEmpty(list)){
+//            PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+//            return ResultVOUtils.page(pageInfo);
+//        }
+//        List<String> orders = list.stream().map(IoOrderDetailBizResponse::getOrderIdFk).collect(Collectors.toList());
+//        finishBizRequest.setOrderIdFks(orders);
+//        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.finishBizDetail(finishBizRequest);
+//        ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
 

src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.req.inout;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 单据业务详情查询参数
  */
@@ -23,11 +25,13 @@ public class FilterOrderDetailBizRequest extends ListPageRequest {
      * 单据号
      */
     private String orderIdFk;
+    private List<String> orderIdFks;
 
     /**
      * 产品名称
      */
     private String productName;
+    private String keyWords;
 
     private Long bizIdFk;
 }

src/main/java/com/glxp/api/req/inout/FilterOrderDetailFinishBizRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.req.inout;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 单据业务详情查询参数
  */
@@ -12,6 +14,7 @@ public class FilterOrderDetailFinishBizRequest extends ListPageRequest {
     private String keyWords;//产品通用名/规格/批次号
 
     private String billNo;
+    private List<String> orderIdFks;
 
     private String action;
     private String startTime;

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -162,17 +162,10 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
 
     @Override
     public List<IoOrderDetailCodeEntity> finishBizDetail(FilterOrderDetailFinishBizRequest finishBizRequest) {
-
-        if (null == finishBizRequest) {
-            return Collections.emptyList();
-        }
-        if (null != finishBizRequest.getPage() && null != finishBizRequest.getLimit()) {
-            PageHelper.offsetPage((finishBizRequest.getPage() - 1) * finishBizRequest.getLimit(), finishBizRequest.getLimit());
-        }
         LambdaQueryWrapper<IoOrderDetailCodeEntity> lw = new LambdaQueryWrapper<>();
-        String keyWords = finishBizRequest.getKeyWords();
+//        String keyWords = finishBizRequest.getKeyWords();
-        lw.apply(StrUtil.isNotBlank(keyWords),"(  coName LIKE concat('%', {0}, '%')  or spec LIKE concat('%', {0}, '%')  or batchNo LIKE concat('%', {0}, '%')) ",keyWords);
+//        lw.apply(StrUtil.isNotBlank(keyWords),"(  coName LIKE concat('%', {0}, '%')  or spec LIKE concat('%', {0}, '%')  or batchNo LIKE concat('%', {0}, '%')) ",keyWords);
-        lw.like(StrUtil.isNotBlank(finishBizRequest.getBillNo()),IoOrderDetailCodeEntity::getOrderIdFk,finishBizRequest.getBillNo());
+        lw.in(CollUtil.isNotEmpty(finishBizRequest.getOrderIdFks()),IoOrderDetailCodeEntity::getOrderIdFk,finishBizRequest.getOrderIdFks());
 
         return ioOrderDetailCodeDao.selectList(lw);
 

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -21,7 +21,20 @@
                 AND batchNo = #{batchNo}
             </if>
             <if test="productName != null and productName != ''">
-                AND bp.cpmctymc like concat('%', #{productName}, '%')
+                AND io_order_detail_biz.coName like concat('%', #{productName}, '%')
+            </if>
+            <if test="orderIdFks != null and orderIdFks.size() != 0">
+                AND orderIdFk in
+                <foreach collection="orderIdFks" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="keyWords != null and keyWords != ''">
+                AND (
+                io_order_detail_biz.coName like concat('%', #{keyWords}, '%')
+                OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%')
+                OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%')
+                )
             </if>
         </where>
         group by io_order_detail_biz.id