zy-asrs.git - Gitblit

			@@ -8,6 +8,7 @@
			import com.core.exception.CoolException;
			import com.zy.api.enums.LocAreaType;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.enums.LocStsType;
			import com.zy.asrs.service.*;
			import com.zy.asrs.service.impl.BasAreasServiceImpl;
			import com.zy.asrs.service.impl.BasStationServiceImpl;
			@@ -85,8 +86,6 @@

			Set<String> exist = new HashSet<>();



			// 获取订单主表
			OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());
			// 备货单
			@@ -147,21 +146,30 @@
			List<Long> areaIds = basAreas.stream()
			.map(BasAreas::getId)
			.collect(Collectors.toList());
			Map<Long, Double> locDetlUsage = new HashMap<>();
			for (OrderDetlPakout orderDetl : orderDetlPakouts) {
			double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
			if (issued <= 0.0D) {
			continue;
			}
			List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
			List<LocDetl> locDetls = locDetlService.queryStockAll(null, null,orderDetl.getMatnr(), orderDetl.getBatch(),
			orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),areaIds);
			for (LocDetl locDetl : locDetls) {
			if (issued > 0) {
			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
			issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
			Long detlId = locDetl.getId();
			Double used = locDetlUsage.getOrDefault(detlId, 0.0);
			Double available = locDetl.getAnfme() - used;
			if (available <= 0.000001) {
			continue;
			}

			Double currentIssue = (issued >= available) ? available : issued;

			LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), currentIssue);
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
			locDto.setFrozen(locDetl.getFrozen());
			locDto.setFrozenLoc(locMast.getFrozen());
			List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
			List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), currentIssue >= available ? 101 : 103);
			locDto.setStaNos(staNos);
			locDto.setBrand(orderDetl.getBrand());

			@@ -172,9 +180,10 @@
			locDto.setBoxType2(orderDetl.getBoxType2());
			locDto.setBoxType3(orderDetl.getBoxType3());
			locDtos.add(locDto);
			exist.add(locDetl.getLocNo());

			locDetlUsage.put(detlId, used + currentIssue);
			// 剩余待出数量递减
			issued = issued - locDetl.getAnfme();
			issued = issued - currentIssue;
			} else {
			break;
			}
			@@ -331,7 +340,7 @@
			return R.error("库存不足");
			}

			Thread.sleep(1000L);
			Thread.sleep(300L);

			List<TaskDto> taskDtos = new ArrayList<>();
			// 根据（库位 & 出库站）分组；理想状态：一组为一次出库任务
			@@ -349,7 +358,10 @@
			// -----------------------------------------------------------------------------------------------
			for (TaskDto taskDto : taskDtos) {
			// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
			BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", taskDto.getAgvStaNo()));
			BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
			.in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
			.eq("dev_no", taskDto.getAgvStaNo()));
			if (Objects.isNull(station)) { throw new CoolException("数据错误，站点不存在或已使用！！"); }
			workService.agvStockOut(station, taskDto, getUserId());
			}
			return R.ok();