YiWuProject.git

			@@ -5,17 +5,21 @@
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.service.DamageService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			import com.mes.edgstoragecage.service.EdgStorageCageService;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@@ -31,10 +35,13 @@
			@Service
			public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {

			@Resource
			@Autowired
			EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
			@Resource
			@Autowired
			UpPattenUsageMapper upPattenUsageMapper;

			@Autowired
			DamageService damageService;

			@Override
			public EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag) {
			@@ -44,7 +51,6 @@
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
			.isNull(EdgStorageCageDetails::getSlot)
			.eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
			.last("order by abs(t.slot - " + currentSlot + ") asc limit 2")
			);
			if (flag && CollectionUtil.isNotEmpty(emptyList)) {
			@@ -54,6 +60,23 @@
			return null;
			}
			return emptyList.get(0);
			}

			/**
			* 查询笼内空格
			*
			* @return
			*/
			@Override
			public List<EdgStorageCage> selectCacheEmpty() {
			return baseMapper.selectJoinList(EdgStorageCage.class, new MPJLambdaWrapper<EdgStorageCage>()
			.selectAll(EdgStorageCage.class)
			.leftJoin(EdgStorageCageDetails.class, on -> on
			.eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot)
			.eq(EdgStorageCageDetails::getState, "100"))
			.isNull(EdgStorageCageDetails::getSlot)
			.last("order by abs(t.slot - 4) asc")
			);
			}

			/**
			@@ -134,6 +157,12 @@
			if (result != null) {
			result.setSlot(0);
			result.setState(201);
			Damage damage =new Damage();
			damage.setGlassId(edgStorageCageDetails.getGlassId());
			damage.setLine(1002);
			damage.setWorkingProcedure("卧式理片");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			edgStorageCageDetailsMapper.updateById(result);
			}
			//添加