wms-master.git - Gitblit

			@@ -65,7 +65,6 @@
			}
			List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
			WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
			.notIn(WaitPakin::getIoStatus, asList)
			.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
			if (!Objects.isNull(pakin)) {
			throw new CoolException("托盘码：" + waitPakin.getBarcode() + "已被组托单：" + pakin.getCode() + "使用！！");
			@@ -119,6 +118,10 @@
			.setAsnCode(warehouseAreasItems.getAsnCode())
			.setAsnItemId(warehouseAreasItems.getAsnItemId())
			.setIsptResult(warehouseAreasItems.getIsptResult())
			.setPlatItemId(warehouseAreasItems.getPlatItemId())
			.setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
			.setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
			.setProjectCode(warehouseAreasItems.getProjectCode())
			.setBatch(warehouseAreasItems.getSplrBatch())
			.setUnit(warehouseAreasItems.getStockUnit())
			.setFieldsIndex(warehouseAreasItems.getFieldsIndex())
			@@ -146,7 +149,7 @@

			}

			double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
			Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();

			if (!waitPakinItemService.saveBatch(items)) {
			throw new CoolException("组托明细保存失败！！");
			@@ -158,9 +161,10 @@
			if (Objects.isNull(one)) {
			throw new CoolException("收货区数据错误！！");
			}
			// one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
			one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
			if (one.getWorkQty() > one.getAnfme()) {
			Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
			Double qty = Math.round((workQty + one.getQty()) * 10000) / 10000.0;
			one.setWorkQty(workQty);
			if (qty.compareTo(one.getAnfme()) > 0) {
			throw new CoolException("组托数量不能大于收货数量！！");
			}
			if (!warehouseAreasItemService.saveOrUpdate(one)) {
			@@ -172,9 +176,6 @@
			if (!this.updateById(waitPakin1)) {
			throw new CoolException("组托数量修改失败！！");
			}

			//TODO 组托完成后，扣减收货区库存

			return pakin;
			}

			@@ -295,8 +296,7 @@
			continue;
			}
			double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
			item.setWorkQty(item.getWorkQty() - sum)
			.setAnfme(item.getAnfme() + sum);
			item.setWorkQty(item.getWorkQty() - sum);
			if (!warehouseAreasItemService.updateById(item)) {
			throw new CoolException("收货区数据回滚失败！！");
			}