wms-master.git - Gitblit

			@@ -35,6 +35,9 @@
			private AsnOrderItemService asnOrderItemService;
			@Autowired
			private AsnOrderService asnOrderService;

			@Autowired
			private WaitPakinService waitPakinService;
			@Autowired
			private WaitPakinItemService waitPakinItemService;

			@@ -61,8 +64,9 @@
			if (StringUtils.isBlank(ruleCode)) {
			throw new CoolException("编码规则错误：编码规则「SYS_WAIT_PAKIN_CODE」规则是不存在");
			}

			pakin.setCode(ruleCode)
			//状态修改为入库中
			.setIoStatus(Short.parseShort("1"))
			.setAnfme(sum)
			.setBarcode(waitPakin.getBarcode());
			if (!this.save(pakin)) {
			@@ -89,7 +93,6 @@
			.setMatnrCode(item.getMatnrCode())
			.setBatch(item.getSplrBatch())
			.setUnit(item.getStockUnit())
			.setBatch(item.getSplrBatch())
			.setFieldsIndex(item.getFieldsIndex())
			.setUnit(item.getStockUnit())
			.setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
			@@ -116,4 +119,31 @@
			}
			return pakin;
			}

			@Override
			public WaitPakin unBind(WaitPakinParam param) {
			String barcode = param.getBarcode();
			if (StringUtils.isNotBlank(barcode)) {
			WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
			if (Objects.isNull(waitPakins)) {
			throw new CoolException("组拖不存在！！");
			}
			List<PakinItem> paramItems = param.getItems();
			if (Objects.isNull(paramItems) \|\| paramItems.isEmpty()) {
			throw new CoolException("解绑物料不能为空！！");
			}
			List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
			List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
			.eq(WaitPakinItem::getPakinId, waitPakins.getId())
			.eq(WaitPakinItem::getMatnrId, list));
			if (pakinItems.isEmpty()) {
			throw new CoolException("数据错误：组拖明细不存在！！");
			}
			if (!waitPakinItemService.removeByIds(pakinItems)) {
			throw new CoolException("组拖明细解绑失败！！");
			}
			return waitPakins;
			}
			return new WaitPakin();
			}
			}