zy-asrs-master.git

			@@ -124,6 +124,9 @@
			}

			DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
			detlDto.setWarehouse(orderDetl.getThreeCode());//来源仓库
			detlDto.setOrigin(orderDetl.getSupp());//来源单号
			detlDto.setOriginNo(orderDetl.getSuppCode());//来源序号
			if (DetlDto.has(detlDtos, detlDto)) {
			DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
			assert one != null;
			@@ -144,6 +147,9 @@
			waitPakin.setZpallet(param.getBarcode()); // 托盘码
			waitPakin.setIoStatus("N"); // 入出状态
			waitPakin.setAnfme(detlDto.getAnfme()); // 数量
			waitPakin.setThreeCode(detlDto.getWarehouse()); // 仓库
			waitPakin.setSupp(detlDto.getOrigin()); // 来源单号
			waitPakin.setSuppCode(detlDto.getOriginNo()); // 来源序号
			waitPakin.setStatus("Y"); // 状态
			waitPakin.setAppeUser(userId);
			waitPakin.setAppeTime(now);
			@@ -239,7 +245,7 @@
			@Transactional
			public R WarehouseIn(String locNo, String barcode,Long hostId) {
			//判断库位状态
			LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId));
			LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
			if (Cools.isEmpty(locMast)){
			return R.error("该库位不存在");
			}
			@@ -308,7 +314,7 @@
			@Transactional
			public R WarehouseOut(CombParam combParam, Long hostId) {
			//判断库位状态
			LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId));
			LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, combParam.getLocno()).eq(LocMast::getHostId,hostId).eq(LocMast::getWhsType,1L));
			if (Cools.isEmpty(locMast)){
			return R.error("该库位不存在");
			}