Merge remote-tracking branch 'origin/master'

wu

2024-07-24 e70689e688fdc7d228e1bbdc2aa6b0ab96665423

Merge remote-tracking branch 'origin/master'

 UI-Project/config.js

@@ -1,7 +1,7 @@
export default {
 serverUrl: "10.153.19.150:88/api",
//  serverUrl: "192.168.1.199:88/api",
  serverUrl2: "10.153.19.150:88"
  // serverUrl2: "192.168.1.199:88"
//  serverUrl: "10.153.19.150:88/api",
 serverUrl: "192.168.1.199:88/api",
  // serverUrl2: "10.153.19.150:88"
  serverUrl2: "192.168.1.199:88"
  //serverUrl:"res.abeim.cn"
}

 UI-Project/src/utils/WebSocketService.js

@@ -18,7 +18,6 @@
      if (!msg.data) {

        return;

      }

      
      const isLastChunk = msg.data.endsWith('<END>');

      //是否为最后一块消息

      messages += msg.data;


 UI-Project/src/utils/constants.js

@@ -1,3 +1,3 @@
// export const WebSocketHost = "192.168.1.199";
export const WebSocketHost = "10.153.19.150";
export const WebSocketHost = "192.168.1.199";
// export const WebSocketHost = "10.153.19.150";
export const host = "88";

 UI-Project/src/views/Identify/identify.vue

@@ -103,13 +103,15 @@
// 破损
const handleDamage = async () => {
  try  {
    var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
      console.log(url);
      const response = await request.post(url)
  // const response = await request.post('/cacheGlass/taskCache/identControls', {
  //   identId: currentGlassId.value,
  //   controlsId: 201,
  //   })
    // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201;
    //   console.log(url);
    //   const response = await request.post(url)
  const response = await request.post('/cacheGlass/taskCache/identControls', {
    identId: currentGlassId.value,
    controlsId: 201,
    line: 1001,
    machine: '识别',
    })
    if (response.code == 200) {
      ElMessage.success(response.message);
      // window.location.reload() 
@@ -128,13 +130,15 @@
 // 人工拿走
const handleManualTake = async () => {
  try  {
    var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
      console.log(url);
      const response = await request.post(url)
  // const response = await request.post('/cacheGlass/taskCache/identControls', {
  //   identId: currentGlassId.value,
  //   controlsId: 200,
  //   })
    // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200;
    //   console.log(url);
    //   const response = await request.post(url)
  const response = await request.post('/cacheGlass/taskCache/identControls', {
    identId: currentGlassId.value,
    controlsId: 200,
    line: 1001,
    machine: '识别',
    })
    if (response.code == 200) {
      // 绑定成功，处理逻辑
      ElMessage.success(response.message);

 UI-Project/src/views/Returns/returns.vue

@@ -594,11 +594,11 @@
    console.error('WebSocket连接异常关闭');  
  }  
};  
  
// 监听WebSocket的消息事件  
ws.onmessage = (event) => {  
  try {  
    const data = JSON.parse(event.data); // 解析消息为JSON  
    
    const data = JSON.parse(event.data.replace('<END>', '')); // 解析消息为JSON  
  
    if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {  
if(data.InkageStatus!=null){
@@ -610,7 +610,7 @@
}
    } else {  
      // 处理错误情况或无效数据  
      console.error('接收到的数据无效', data);  
      // console.error('接收到的数据无效', data);  
    }  
  } catch (error) {  
    console.error('解析WebSocket消息时发生错误', error);  

 UI-Project/src/views/StockBasicData/stockBasicData.vue

@@ -50,7 +50,9 @@
      // 用户点击了“是”，现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.GlassId,
        controlsId: 300
        controlsId: 300,
        line: 2001,
        machine: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);
@@ -81,7 +83,9 @@
      // 用户点击了“是”，现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.GlassId,
        controlsId: 301
        controlsId: 301,
        line: 2001,
        machine: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);

 UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue

@@ -50,7 +50,9 @@
      // 用户点击了“是”，现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.GlassId,
        controlsId: 300
        controlsId: 300,
        line: 2002,
        machine: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);
@@ -81,7 +83,9 @@
      // 用户点击了“是”，现在调用删除接口  
      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
        glassId: row.GlassId,
        controlsId: 301
        controlsId: 301,
        line: 2002,
        machine: '冷加工',
    })
    if (response.code === 200) {
      ElMessage.success(response.message);

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java

@@ -122,7 +122,7 @@
            if(this.session.isOpen()){
                int maxChunkSize = 50000; // 定义最大的分块大小
                int length = message.length();
                if(length>50000){
//                if(length>50000){
                    int chunks = (int) Math.ceil((double) length / maxChunkSize);
                    //分块发送消息
                    for (int i = 0; i < chunks; i++) {
@@ -138,9 +138,9 @@
                        // 发送分块消息，并传递是否是最后一块消息的标识
                        this.session.getBasicRemote().sendText(chunk);
                    }
                }else{
                    this.session.getBasicRemote().sendText(message);
                }
//                }else{
//                    this.session.getBasicRemote().sendText(message);
//                }

            }
        } catch (Exception e) {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java

@@ -388,6 +388,7 @@
    public List<Map<String, Object>> selectTemperingGlass(){
        QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
        wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
                .in("state",Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL)
                .groupBy("engineer_id,tempering_layout_id");
        List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
        return TemperingGlass;

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java

@@ -120,7 +120,10 @@
        JSONObject jsonObject = new JSONObject();
        //正在进行的任务
        List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
        if(upPattenUsages!=null){
        jsonObject.append("prioritylist", upPattenUsages);
        }

        //工位信息
        List<UpWorkstation> upWorkstations = upWorkstationService.list();
        jsonObject.append("list", upWorkstations);