wms-master.git - Gitblit

			@@ -248,6 +248,7 @@
			// }
			AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
			.eq(AsnOrderItem::getAsnCode, asnCode)
			.eq(AsnOrderItem::getTrackCode, dto.getBarcode())
			.eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
			if (Objects.isNull(orderItem)) {
			throw new CoolException("通知单明细不存在！！");
			@@ -653,7 +654,9 @@
			itemList.forEach(asnOrderItem -> {
			LocItem item = new LocItem();
			BeanUtils.copyProperties(asnOrderItem, item);
			item.setId(loc.getId())
			item.setLocId(loc.getId())
			.setId(null)
			.setLocCode(loc.getCode())
			.setOrderId(order.getId())
			.setOrderItemId(asnOrderItem.getId())
			.setWkType(Short.parseShort(order.getWkType()))
			@@ -850,7 +853,11 @@
			*/
			@Override
			public R getDeviceSites() {
			return R.ok(deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getStatus, 1).groupBy(DeviceSite::getSite)));
			List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
			.select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
			.eq(DeviceSite::getStatus, 1)
			.groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
			return R.ok(sites);
			}

			/**
			@@ -919,7 +926,8 @@
			}
			//获取当前库存信息
			LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
			.eq(LocItem::getOrderItemId, asnOrderItem.getId())
			// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
			.eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
			.eq(LocItem::getBatch, asnOrderItem.getBatch())
			.eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
			//SET 当前库存数量