wms-master.git - Gitblit

			@@ -1,6 +1,5 @@
			package com.vincent.rsf.server.api.service.impl;

			import com.alibaba.druid.sql.visitor.functions.If;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.vincent.rsf.framework.common.Cools;
			import com.vincent.rsf.framework.common.R;
			@@ -142,7 +141,7 @@
			if (StringUtils.isEmpty(barcode)) {
			return R.error("标签码不能为空！！");
			}
			List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getBarcode, barcode));
			List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
			if (Objects.isNull(asnOrderItem)) {
			throw new CoolException("单据明细不存在！！");
			}
			@@ -166,7 +165,6 @@
			if (Objects.isNull(params.getWhAreaId())) {
			throw new CoolException("库区标识不能为空！！");
			}


			WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
			if (Objects.isNull(areasItem)) {
			@@ -200,7 +198,7 @@
			if (Objects.isNull(dto.getReceiptQty())) {
			throw new CoolException("收货数据不能为空！！");
			}
			if (dto.getReceiptQty() < dto.getPurQty()) {
			if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
			throw new CoolException("收货数量不能大于采购数量！！");
			}

			@@ -296,6 +294,7 @@

			AsnOrderLog orderLog = new AsnOrderLog();
			BeanUtils.copyProperties(asnOrder, orderLog);
			orderLog.setAsnId(asnOrder.getId());

			if (!asnOrderLogService.save(orderLog)) {
			throw new CoolException("主单历史档添加失败！！");
			@@ -306,6 +305,8 @@
			items.forEach(item -> {
			AsnOrderItemLog itemLog = new AsnOrderItemLog();
			BeanUtils.copyProperties(item, itemLog);
			itemLog.setAsnItemId(itemLog.getId())
			.setAsnId(item.getAsnId());
			logs.add(itemLog);
			});

			@@ -389,7 +390,8 @@
			.setMaktx(asnOrderItem.getMaktx())
			.setBarcode(asnOrderItem.getBarcode())
			.setPoCode(asnOrderItem.getPoCode())
			.setPurQty(asnOrderItem.getAnfme())
			.setAnfme(asnOrderItem.getAnfme())
			.setPurQty(asnOrderItem.getPurQty())
			.setSplrBatch(asnOrderItem.getSplrBatch());

			Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());