Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-16 68512a5e86b96e9b54023f861f6137f37789136e

Merge remote-tracking branch 'origin/master'

 UI-Project/src/views/Caching/cachingun.vue

@@ -194,7 +194,7 @@
const toggleEnableState = async (row) => {  
  const newState = row.enable_state === 1 ? 0 : 1;  
  // 发送请求到后端更新状态（这里省略了实际的请求逻辑）  
  const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enablestate: newState });  
  const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enableState: newState });  
  if (response.code === 200) {
      ElMessage.success(response.message);
      } else {  
@@ -202,6 +202,9 @@
      }  
  row.enable_state = newState;  
};



const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
// 定义消息处理函数，更新 receivedData 变量
const handleMessage = (data) => {

 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue

@@ -195,8 +195,8 @@
   

    const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
      enableState: 1 - row.enableState

      enableState:row.enableState,
      id:row.id
    }); 
    console.log('Updated row status:', response.data);
    // 可以根据后端返回的数据进行进一步处理，比如更新本地状态等

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

@@ -7,6 +7,7 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -109,7 +110,8 @@
            for (Map<String, Object> cutTerritory : cutTerritorys) {
                EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
                        .selectAll(EdgStorageCageDetails.class)
                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id")));
                        .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))
                        .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
//                log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
                if(edgStorageCageDetails!=null){
                    cutTerritory.put("glass_state",edgStorageCageDetails.getState());

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java

@@ -152,10 +152,19 @@
    @Override
    public boolean updateDownStorageCage(DownStorageCage downStorageCage) {
        DownStorageCage downItem = baseMapper.selectById(downStorageCage.getId());
        if (downItem != null) {
        downItem.setEnableState(downStorageCage.getEnableState());
        baseMapper.updateById(downItem);
            int rowsAffected = baseMapper.updateById(downItem);
            if (rowsAffected > 0) {
        return true;
            } else {
                return false;
    }
        } else {
            return false;
        }
    }


    /**
     * 修改理片笼信息 功能：对笼内栅格玻璃 【添加/删除/更换】

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java

@@ -10,7 +10,6 @@
import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.entity.DownWorkstionAndDownGlassinfo;
@@ -172,9 +171,6 @@
    }





    @Override
    public DownWorkstation selectByFlowCardId(String flowcardid) {
        QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
@@ -197,10 +193,21 @@

    @Override
    public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {

        DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());

        if (downWork != null) {

        downWork.setEnableState(downWorkstation.getEnableState());

        baseMapper.updateById(downWork);

        return true;
        } else {

            return false;
    }
    }


}

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java

@@ -12,6 +12,7 @@
import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl;
import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;

import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
@@ -190,6 +191,28 @@
        //downGlassTaskService.getUnloadingTaskState();
    }

    @Test
    public void updateDownWorkstationstate() {

        DownWorkstation downWorkstation=  new DownWorkstation();

        downWorkstation.setId(1);
        downWorkstation.setEnableState(0);
        downWorkstationServiceImpl.updateDownWorkstationstate(downWorkstation);
    }


    @Test
    public void updateDownstate() {

        DownStorageCage downStorageCage=  new DownStorageCage();

        downStorageCage.setId(1);
        downStorageCage.setEnableState(0);
        downStorageCageServiceImpl.updateDownStorageCage(downStorageCage);
    }


 /*   @Test
    public void updateDownStorageCage() {