no message

youchain-system/src/main/java/com/youchain/basicdata/rest/ItemController.java

@@ -68,7 +68,7 @@ public class ItemController {
 
     @GetMapping("/itemList")
     @ApiOperation("查询所有的物料数据")
-    public ResponseEntity<List<ItemDto>> queryItemList(ItemQueryCriteria criteria, Pageable pageable) {
+    public ResponseEntity<List<ItemDto>> queryItemList(ItemQueryCriteria criteria) {
         return new ResponseEntity<>(itemService.queryAll(criteria), HttpStatus.OK);
     }
 

youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java

@@ -15,9 +15,7 @@
  */
 package com.youchain.businessdata.service.impl;
 
-import com.youchain.RequestData.ItemDate;
 import com.youchain.RequestData.Yclbl;
-import com.youchain.RequestData.ZcData;
 import com.youchain.basicdata.domain.Item;
 import com.youchain.basicdata.domain.Point;
 import com.youchain.basicdata.repository.ItemRepository;
@@ -36,7 +34,6 @@ import com.youchain.businessdata.service.PickService;
 import com.youchain.businessdata.service.dto.PickDto;
 import com.youchain.businessdata.service.dto.PickQueryCriteria;
 import com.youchain.businessdata.service.mapstruct.PickMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.Page;
@@ -46,9 +43,7 @@ import java.util.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -190,7 +185,9 @@ public class PickServiceImpl implements PickService {
         List<PickDetail> createPickDetails = new ArrayList<>();
         AtomicInteger lineNo = new AtomicInteger(1);
 
-        /** 合并两个循环，减少重复操作 */
+
+
+        /** 遍历成品集合 */
         yclbl.getBlzc().forEach(zcData -> {
             Pick pick = createPick(yclbl.getOrderNo(), lineNo.getAndIncrement(), zcData.getCompleteCode(), zcData.getStation());
             createPicks.add(pick);
@@ -201,6 +198,7 @@ public class PickServiceImpl implements PickService {
             });
         });
 
+        /** 遍历单品品集合 */
         yclbl.getBlzcmx().forEach(itemDate -> {
             Pick pick = createPick(yclbl.getOrderNo(), lineNo.getAndIncrement(), itemDate.getItemCode(), itemDate.getStation());
             createPicks.add(pick);

youchain-system/src/test/java/com/youchain/EladminSystemApplicationTests.java

@@ -19,64 +19,7 @@ public class EladminSystemApplicationTests {
     }
 
     public static void main(String[] args) {
-        GdDetail gdDetail1 = new GdDetail();
-        gdDetail1.setBigItem(null);
-        gdDetail1.setOrderType("单品");
 
-        GdDetail gdDetail2 = new GdDetail();
-        BigItem bigItem2 = new BigItem();
-        bigItem2.setCode("CT_001");
-        gdDetail2.setBigItem(bigItem2);
-        gdDetail2.setOrderType("成品");
-        gdDetail2.setBigItemQty(1d);
-        gdDetail2.setStation("OP1070-2");
-
-        GdDetail gdDetail3 = new GdDetail();
-        BigItem bigItem3 = new BigItem();
-        bigItem3.setCode("CT_001");
-        gdDetail3.setBigItem(bigItem3);
-        gdDetail3.setOrderType("成品");
-        gdDetail3.setBigItemQty(2d);
-        gdDetail3.setStation("OP1070-1");
-
-        GdDetail gdDetail4 = new GdDetail();
-        BigItem bigItem4 = new BigItem();
-        bigItem4.setCode("CT_002");
-        gdDetail4.setBigItem(bigItem4);
-        gdDetail4.setOrderType("成品");
-        gdDetail4.setBigItemQty(3d);
-        gdDetail4.setStation("OP2060");
-
-        GdDetail gdDetail5 = new GdDetail();
-        BigItem bigItem5 = new BigItem();
-        bigItem5.setCode("CT_002");
-        gdDetail5.setBigItem(bigItem5);
-        gdDetail5.setOrderType("成品");
-        gdDetail5.setBigItemQty(4d);
-        gdDetail5.setStation("OP1030");
-
-        List<GdDetail> gdDetailList = new ArrayList<>();
-        gdDetailList.add(gdDetail1);
-        gdDetailList.add(gdDetail2);
-        gdDetailList.add(gdDetail3);
-        gdDetailList.add(gdDetail4);
-        gdDetailList.add(gdDetail5);
-
-        Map<String, Map<String, List<GdDetail>>> groupedGdDetailMap = gdDetailList.stream()
-                .filter(gdDetail -> BaseStatus.GD_TYPE_CT.equals(gdDetail.getOrderType()))
-                .filter(gdDetail -> gdDetail.getBigItem() != null)
-                .collect(Collectors.groupingBy(
-                        gdDetail -> gdDetail.getBigItem().getCode(),
-                        Collectors.groupingBy(GdDetail::getStation)
-                ));
-
-        groupedGdDetailMap.forEach((code, stationMap) -> {
-            stationMap.forEach((station, gdDetails) -> {
-                gdDetails.forEach(gdDetail -> {
-                    System.out.println("Code: " + code + ", Station: " + station + ", GdDetail: " + gdDetail);
-                });
-            });
-        });
     }
 
     private static final int MAX_TASK_COUNT = 4;