zy-asrs.git - Gitblit

			@@ -63,70 +63,74 @@
			return R.parse(BaseRes.PARAM);
			}

			// 订单明细
			List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
			if (orderDetls.isEmpty()) {
			return R.parse("请选择数据");
			}

			// 获取订单主表
			Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo()));
			Order order = orderService.selectOne(
			new EntityWrapper<Order>().eq("order_no", orderDetls.get(0).getOrderNo())
			);
			if (order == null) {
			return R.parse("订单数据为空");
			}

			// 按包装组号分组处理
			Map<String, List<OrderDetl>> brandGroup = orderDetls.stream()
			.collect(Collectors.groupingBy(OrderDetl::getBrand));

			List<LocDto> locDtos = new ArrayList<>();

			Set<String> exist = new HashSet<>();
			// 每个包装组查一次库存
			for (Map.Entry<String, List<OrderDetl>> entry : brandGroup.entrySet()) {
			String brand = entry.getKey();
			List<OrderDetl> brandOrderDetls = entry.getValue();

			for (OrderDetl orderDetl : orderDetls) {
			double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
			if (issued <= 0.0D) { continue; }
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("brand",orderDetl.getBrand()));
			if (issued > 0 && !locDetls.isEmpty()) {
			// 根据单据类型返回出库口列表 21出库口，22盘点口，23反修品出库口
			List<Integer> staNos = new ArrayList<>();
			if (order.getDocType() == 21) {
			staNos.add(3077);
			staNos.add(3106);
			} else if(order.getDocType() == 22) {
			staNos.add(3041);
			} else if(order.getDocType() == 23) {
			staNos.add(3092);
			staNos.add(3102);
			staNos.add(3095);
			}
			LocDto locDto = new LocDto();
			locDto.setLocNo(locDetls.get(0).getLocNo());
			// wrkDetl.setMatnr(roll.getSpecs()); // 规格
			// wrkDetl.setMaktx(roll.getSpecs()); //规格
			// locDto.setBatch(locDetl.getBatch()); // 箱号
			// locDto.setModel(locDetl.getModel()); // 卷号
			locDto.setBrand(orderDetl.getBrand()); // 包装组号
			// locDto.setOrigin(locDetl.getOrigin()); // 木箱在托盘位置
			// locDto.setWeight(locDetl.getWeight()); // 净重
			// locDto.setVolume(locDetl.getVolume()); // 毛重
			// locDto.setPrice(locDetl.getPrice());
			// locDto.setSpecs(locDetl.getSpecs());
			// locDto.setZpallet(locDetl.getZpallet());
			locDto.setOrderNo(orderDetl.getOrderNo());
			locDto.setStaNos(staNos);
			locDto.setOrderDetlId(orderDetl.getId());
			locDtos.add(locDto);
			// exist.add(locDetl.getLocNo());
			// // 剩余待出数量递减
			// issued = issued - locDetl.getAnfme();
			} else {
			break;
			}
			// if (issued > 0) {
			// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
			// locDto.setLack(Boolean.TRUE);
			// locDtos.add(locDto);
			// }
			// 查这个包装组对应的所有库存
			List<LocDetl> locDetls = locDetlService.selectList(
			new EntityWrapper<LocDetl>().eq("brand", brand)
			);
			if (locDetls.isEmpty()) continue;

			// 获取出库口
			List<Integer> staNos = new ArrayList<>();
			if (order.getDocType() == 21) {
			staNos.add(3077); staNos.add(3106);
			} else if (order.getDocType() == 22) {
			staNos.add(2041);
			} else if (order.getDocType() == 23) {
			staNos.add(3092); staNos.add(3102); staNos.add(3095);
			}

			// 去重 key，避免相同 loc+unit+model 重复显示
			Set<String> seen = new HashSet<>();

			for (LocDetl locDetl : locDetls) {
			String key = locDetl.getLocNo() + "\|" + locDetl.getUnit() + "\|" + locDetl.getModel();
			if (seen.contains(key)) continue;
			seen.add(key);

			// 对应多个明细时，分配到第一个明细（或你可以拆分多个）
			OrderDetl firstDetl = brandOrderDetls.get(0);

			LocDto locDto = new LocDto();
			locDto.setLocNo(locDetl.getLocNo());
			locDto.setUnit(locDetl.getUnit());
			locDto.setModel(locDetl.getModel());
			locDto.setThreeCode(locDetl.getThreeCode());
			locDto.setBrand(brand);
			locDto.setOrderNo(firstDetl.getOrderNo());
			locDto.setStaNos(staNos);
			locDto.setOrderDetlId(firstDetl.getId());

			locDtos.add(locDto);
			}
			}

			return R.ok().add(locDtos);
			}



			@PostMapping("/out/refund/loc/preview/auth")
			@ManagerAuth
			@@ -251,7 +255,12 @@
			for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
			LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
			.eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
			if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
			if (null != one) {
			if(!"合格".equals(one.getThreeCode())) {
			throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode() );
			}
			locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
			}
			}
			if (!locDetlDtos.isEmpty()) {
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
			@@ -260,7 +269,7 @@
			Order order = orderService.selectByNo(stockOutParam.getOrderNo());

			// 启动出库开始
			workService.stockOut(staNo, locDetlDtos, order.getDocType() == 22 ? IoWorkType.CHECK_OUT : null, getUserId());
			workService.stockOut(staNo, locDetlDtos, order.getDocType() == 23 ? IoWorkType.CHECK_OUT : null, getUserId());
			}else {
			throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
			}