no message
							parent
							
								
									4c5fbb8b33
								
							
						
					
					
						commit
						09224ef6ef
					
				| 
						 | 
					@ -10,6 +10,7 @@ import com.youchain.basicdata.domain.Stock;
 | 
				
			||||||
import com.youchain.basicdata.service.PointService;
 | 
					import com.youchain.basicdata.service.PointService;
 | 
				
			||||||
import com.youchain.basicdata.service.StockService;
 | 
					import com.youchain.basicdata.service.StockService;
 | 
				
			||||||
import com.youchain.businessdata.domain.*;
 | 
					import com.youchain.businessdata.domain.*;
 | 
				
			||||||
 | 
					import com.youchain.businessdata.repository.InventoryRepository;
 | 
				
			||||||
import com.youchain.businessdata.service.*;
 | 
					import com.youchain.businessdata.service.*;
 | 
				
			||||||
import com.youchain.exception.BadRequestException;
 | 
					import com.youchain.exception.BadRequestException;
 | 
				
			||||||
import com.youchain.modules.quartz.utils.TimeNumberUtils;
 | 
					import com.youchain.modules.quartz.utils.TimeNumberUtils;
 | 
				
			||||||
| 
						 | 
					@ -29,6 +30,7 @@ import java.util.stream.Collectors;
 | 
				
			||||||
@Slf4j
 | 
					@Slf4j
 | 
				
			||||||
@RequiredArgsConstructor
 | 
					@RequiredArgsConstructor
 | 
				
			||||||
public class KMReServiceImpl implements KMReService {
 | 
					public class KMReServiceImpl implements KMReService {
 | 
				
			||||||
 | 
					    private final InventoryRepository inventoryRepository;
 | 
				
			||||||
    private final DictRepository dictRepository;
 | 
					    private final DictRepository dictRepository;
 | 
				
			||||||
    private final PickService pickService;
 | 
					    private final PickService pickService;
 | 
				
			||||||
    private final StockService stockService;
 | 
					    private final StockService stockService;
 | 
				
			||||||
| 
						 | 
					@ -772,8 +774,20 @@ public class KMReServiceImpl implements KMReService {
 | 
				
			||||||
    private void handleJl(Stock stock, Point endPoint, AgvTask agvTask) {
 | 
					    private void handleJl(Stock stock, Point endPoint, AgvTask agvTask) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        List<Task> taskList = taskService.findTaskByCallAgvTask(agvTask.getId());
 | 
					        List<Task> taskList = taskService.findTaskByCallAgvTask(agvTask.getId());
 | 
				
			||||||
 | 
					        List<String> areaNames = taskList.stream()
 | 
				
			||||||
 | 
					                .map(task -> task.getItemKey().getItem())
 | 
				
			||||||
 | 
					                .map(item -> BizStatus.XJ.equals(item.getGoodType()) ? AreaNameDic.XJFBCQ : AreaNameDic.DJFBCQ)
 | 
				
			||||||
 | 
					                .collect(Collectors.toList());
 | 
				
			||||||
 | 
					        List<Inventory> allInventories = new ArrayList<>();
 | 
				
			||||||
 | 
					        for (String areaName : areaNames) {
 | 
				
			||||||
 | 
					            List<Inventory> inventoryList = inventoryRepository.queryInventory(stock.getId(), null, null, areaName, stock.getDept().getId());
 | 
				
			||||||
 | 
					            allInventories.addAll(inventoryList);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // 删除所有查询到的库存
 | 
				
			||||||
 | 
					        if (!allInventories.isEmpty()) {
 | 
				
			||||||
 | 
					            inventoryRepository.deleteAll(allInventories);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        for (Task task : taskList) {
 | 
					        for (Task task : taskList) {
 | 
				
			||||||
            inventoryService.deleteAll(new Long[]{task.getNewInvId()});
 | 
					 | 
				
			||||||
            //回传MES
 | 
					            //回传MES
 | 
				
			||||||
            pickService.returnPickByTask(task);
 | 
					            pickService.returnPickByTask(task);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue