修改大理片为按工程数分前后两块进片

ZengTao

2024-11-01 eb852430ce781189ca5f9f6abcf3da539464c79e

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java

@@ -19,6 +19,7 @@
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;
@@ -35,9 +36,9 @@
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {

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

    @Autowired
@@ -51,6 +52,7 @@
                        .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)) {
@@ -129,13 +131,13 @@
    @Override
    public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) {
        EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId());
        if(edgItem!=null){
        if (edgItem != null) {
            edgItem.setEnableState(edgStorageCage.getEnableState());
            baseMapper.updateById(edgItem);
            log.info("卧室缓存：【启用/禁用】 参数:{} 结果:成功",edgStorageCage);
            log.info("卧室缓存：【启用/禁用】 参数:{} 结果:成功", edgStorageCage);
            return true;
        }
        log.info("卧室缓存：【启用/禁用】 参数:{} 结果:失败",edgStorageCage);
        log.info("卧室缓存：【启用/禁用】 参数:{} 结果:失败", edgStorageCage);
        return false;
    }

@@ -153,15 +155,20 @@
        EdgStorageCageDetails edgDItem = edgStorageCageDetailsMapper.selectById(edgStorageCageDetails.getId());
        if (edgItem != null) {
            //移除  （破损,目前两个概念混合在一起,建议拆开）
            EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, edgStorageCageId));
            EdgStorageCageDetails result = edgStorageCageDetailsMapper.selectOne(
                    new MPJLambdaWrapper<EdgStorageCageDetails>()
                            .eq(EdgStorageCageDetails::getSlot, edgStorageCageId)
                            .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
            );
            if (result != null) {
                result.setSlot(0);
                result.setState(201);
                Damage damage =new Damage();
                Damage damage = new Damage();
                damage.setGlassId(edgStorageCageDetails.getGlassId());
                damage.setLine(1002);
                damage.setWorkingProcedure("卧式理片");
                damage.setStatus(2);
                damage.setLine(2001);
                damage.setWorkingProcedure("磨边");
                damage.setStatus(1);
                damage.setType(8);
                damageService.insertDamage(damage);
                edgStorageCageDetailsMapper.updateById(result);
            }