Merge remote-tracking branch 'origin/master'

zhoushihao

3 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java

@@ -7,9 +7,11 @@
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import org.springframework.beans.factory.annotation.Value;
import com.mes.common.config.ConstSysConfig;
import com.mes.sysconfig.service.SysConfigService;
import org.springframework.stereotype.Service;

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

/**
@@ -23,8 +25,10 @@
@Service
public class BigStorageCageFeedTaskServiceImpl extends ServiceImpl<BigStorageCageFeedTaskMapper, BigStorageCageFeedTask> implements BigStorageCageFeedTaskService {

    @Value("${mes.glassGap}")
    private Integer glassGap;
    //    @Value("${mes.glassGap}")
//    private Integer glassGap;
    @Resource
    SysConfigService sysConfigService;

    @Override
    public void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType) {
@@ -45,6 +49,7 @@

    @Override
    public BigStorageDTO querySitToUpRemainWidth(Integer line) {
        Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
        return baseMapper.querySitToUpRemainWidth(line, glassGap);
    }