Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-22 acad4da05b4af1f87df783c4b14fc65a07d11d00

Merge remote-tracking branch 'origin/master'

 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue

@@ -22,54 +22,107 @@
const handleMessage = (data) => {
// 进炉中
  if(data.intoGlass!=null){
    adjustedRects.value =  data.intoGlass[0].map(rect => ({  
    adjustedRects.value =  data.intoGlass[0].map(rect => {  
        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
        if (rect.angle === 90) {  
          adjustedWidth = rect.height * 0.3;  
          adjustedHeight = rect.width * 0.3;  
          adjustedWidtha = rect.height;  
          adjustedHeighta = rect.width;  
        } else {  
          adjustedWidth = rect.width * 0.3;  
          adjustedHeight = rect.height * 0.3;  
          adjustedWidtha = rect.width;  
          adjustedHeighta = rect.height;  
        }  
        return {  
        ...rect, 
        xcoordinate: rect.xCoordinate * 0.3,
        ycoordinate: rect.yCoordinate * 0.3,
        width: rect.width * 0.2,
        height: rect.height * 0.2,
        widtha: rect.width,
        heighta: rect.height,
      })); 
    }
        width: adjustedWidth,  
        height: adjustedHeight,  
        widtha: adjustedWidtha, 
        heighta: adjustedHeighta,
      };  
      });
      }
  if(data.intoGlass2!=null){
    adjustedRects2.value =  data.intoGlass2[0].map(rect => ({  
    adjustedRects2.value =  data.intoGlass2[0].map(rect => {  
        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
        if (rect.angle === 90) {  
          adjustedWidth = rect.height * 0.3;  
          adjustedHeight = rect.width * 0.3;  
          adjustedWidtha = rect.height;  
          adjustedHeighta = rect.width;  
        } else {  
          adjustedWidth = rect.width * 0.3;  
          adjustedHeight = rect.height * 0.3;  
          adjustedWidtha = rect.width;  
          adjustedHeighta = rect.height;  
        }  
        return {  
        ...rect, 
        xcoordinate: rect.xCoordinate * 0.3,
        ycoordinate: rect.yCoordinate * 0.3,
        width: rect.width * 0.2,
        height: rect.height * 0.2,
        widtha: rect.width,
        heighta: rect.height,
      })); 
    }
        width: adjustedWidth,  
        height: adjustedHeight,  
        widtha: adjustedWidtha, 
        heighta: adjustedHeighta,
      };  
      });
      }
  // 进炉前
  if(data.waitingGlass!=null){
    adjustedRectsa.value = data.waitingGlass[0].map(rect => ({  
        ...rect, // 复制原始对象的其他属性  
        x: rect.xCoordinate * 0.4,
        y: rect.yCoordinate * 0.4,
        width: rect.width * 0.4,
        height: rect.height * 0.4,
        widtha: rect.width,
        heighta: rect.height,
        state: rect.state,
      }));
    }
    adjustedRectsa.value = data.waitingGlass[0].map(rect => {  
  let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
  if (rect.angle === 90) {  
    adjustedWidth = rect.height * 0.4;  
    adjustedHeight = rect.width * 0.4;  
    adjustedWidtha = rect.height;  
    adjustedHeighta = rect.width;  
  } else {  
    adjustedWidth = rect.width * 0.4;  
    adjustedHeight = rect.height * 0.4;  
    adjustedWidtha = rect.width;  
    adjustedHeighta = rect.height;  
  }  
  return {  
    ...rect, 
    x: rect.xCoordinate * 0.4,  
    y: rect.yCoordinate * 0.4,  
    width: adjustedWidth,  
    height: adjustedHeight,  
    widtha: adjustedWidtha, 
    heighta: adjustedHeighta,
  };  
});
  }
    // 已出炉
  if(data.outGlass!=null){
    adjustedRectsb.value = data.outGlass[0].map(rect => ({  
    adjustedRectsb.value = data.outGlass[0].map(rect => {  
  let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
  if (rect.angle === 90) {  
    adjustedWidth = rect.height * 0.4;  
    adjustedHeight = rect.width * 0.4;  
    adjustedWidtha = rect.height;  
    adjustedHeighta = rect.width;  
  } else {  
    adjustedWidth = rect.width * 0.4;  
    adjustedHeight = rect.height * 0.4;  
    adjustedWidtha = rect.width;  
    adjustedHeighta = rect.height;  
  }  
  return {  
        ...rect, // 复制原始对象的其他属性  
        x: rect.xCoordinate * 0.4,
        y: rect.yCoordinate * 0.4,
        width: rect.width * 0.4,
        height: rect.height * 0.4,
        widtha: rect.width,
        heighta: rect.height,
        state: rect.state
      }));
      console.log(data.outGlass[0]);
    }  
        width: adjustedWidth,  
        height: adjustedHeight,  
        widtha: adjustedWidtha, 
        heighta: adjustedHeighta,
  };  
});
  }
};
onMounted(() => {
  initializeWebSocket(socketUrl, handleMessage);

 UI-Project/src/views/PurchaseReturn/purchaseStorage.vue

@@ -30,16 +30,30 @@
const handleMessage = (data) => {
  // 更新 tableData 的数据
  if(data.overGlass!=null){
    adjustedRects.value =  data.overGlass[0].map(rect => ({  
        ...rect, // 复制原始对象的其他属性  
        xcoordinate: rect.xCoordinate * 0.4, // 将x值除以3  
        ycoordinate: rect.yCoordinate * 0.4,
        width: rect.width * 0.4,
        height: rect.height * 0.4,
        widtha: rect.width,
        heighta: rect.height,
      })); 
    }
    adjustedRects.value =  data.overGlass[0].map(rect => {  
  let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
  if (rect.angle === 90) {  
    adjustedWidth = rect.height * 0.3;  
    adjustedHeight = rect.width * 0.3;  
    adjustedWidtha = rect.height;  
    adjustedHeighta = rect.width;  
  } else {  
    adjustedWidth = rect.width * 0.3;  
    adjustedHeight = rect.height * 0.3;  
    adjustedWidtha = rect.width;  
    adjustedHeighta = rect.height;  
  }  
  return {  
    ...rect, // 复制原始对象的其他属性  
    xcoordinate: rect.xCoordinate * 0.3, 
    ycoordinate: rect.yCoordinate * 0.3,
    width: adjustedWidth,  
    height: adjustedHeight,  
    widtha: adjustedWidtha, 
    heighta: adjustedHeighta,
  };  
});
  }
};
onMounted(() => {
  // fetchFlowCardId();

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -66,7 +66,7 @@
        List<OptimizeUpPattenUsage> upPattenUsageList = null;
        if (engineeringId != null) {
            upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
                    .select("t.project_no,t.glass_type,b.width,b.height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.count")
                    .select("t.project_no,t.glass_type,b.width,b.height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.count as stockId")
                    .leftJoin("optimize_layout b on t.project_no=b.project_no")
                    .eq("b.project_no", engineeringId));
        }

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java

@@ -25,7 +25,7 @@
     * fixedDelay : 上一个调用结束后再次调用的延时
     */

    @Scheduled(fixedDelay = 2000)
    @Scheduled(fixedDelay = 1000)
    public void temperingGlassHome(){
        JSONObject jsonObject = new JSONObject();
        //正在等待进片的玻璃
@@ -34,12 +34,14 @@
        //获取整在炉中的两个版图id
        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
        //进炉中的玻璃
        List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
        jsonObject.append("intoGlass", intoGlass);
        //进炉中的第二个版图
        if (layoutId.size() > 1) {
            List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
            jsonObject.append("intoGlass2", intoGlass2);
        if(!layoutId.isEmpty()) {
            List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
            jsonObject.append("intoGlass", intoGlass);
            //进炉中的第二个版图
            if (layoutId.size() > 1) {
                List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
                jsonObject.append("intoGlass2", intoGlass2);
            }
        }
        //出炉后的玻璃
        List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
@@ -60,5 +62,23 @@
            }
        }
    }
    @Scheduled(fixedDelay = 1000)
    public void temperingIsRun(){
        JSONObject jsonObject = new JSONObject();
        //正在进行的任务
        List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType();
        jsonObject.append("temperingTaskType", temperingTaskType);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {
                    webserver.sendMessage(jsonObject.toString());
                } else {
                    log.info("Home is closed");
                }
            }
        }
    }


}