~zhoushihao/YiWuProject.git

			@@ -8,6 +8,7 @@
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.common.config.Const;
			import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
			import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
			import com.mes.rawglassdetails.entity.request.RawGlassRequest;
			import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
			import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
			@@ -102,20 +103,33 @@
			}

			@Override
			public String UpdateQuantity(RawGlassRequest request) {
			update(
			new LambdaUpdateWrapper<RawGlassStorageDetails>()
			.set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
			.eq(RawGlassStorageDetails::getSlot, request.getSlot())
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
			public String updateQuantity(RawGlassRequest request) {
			RawGlassStorageDetails one = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, request.getSlot())
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
			if (null == one) {
			RawGlassStorageDetails details = new RawGlassStorageDetails();
			BeanUtils.copyProperties(request, details);
			details.setState(Const.RAW_GLASS_STATE_IN);
			details.setShelf(request.getSlot());
			save(details);
			} else {
			update(
			new LambdaUpdateWrapper<RawGlassStorageDetails>()
			.set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
			.set(RawGlassStorageDetails::getPatternWidth, request.getPatternWidth())
			.set(RawGlassStorageDetails::getPatternHeight, request.getPatternHeight())
			.set(RawGlassStorageDetails::getPatternThickness, request.getPatternThickness())
			.set(RawGlassStorageDetails::getFilmsId, request.getFilmsId())
			.eq(RawGlassStorageDetails::getSlot, request.getSlot())
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
			}
			return "success";
			}

			@Override
			public String deleteWarehousing(Long slotId) {
			update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
			.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
			remove(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
			return "success";
			}

			@@ -192,11 +206,16 @@
			}

			@Override
			public String shelfReset(Long slot){
			public String shelfReset(Long slot) {
			update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slot)
			.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
			.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET));
			//生成一条详情数据仅记录架子状态
			return "success";
			}

			@Override
			public List<RawGlassStorageDetailsDTO> patternUsage(String width, String height, String thickness, String films){
			return baseMapper.patternUsage(width, height, thickness, films);
			}
			}