Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-25 78311acaaf04aab09f400a5c958c9d6cbc2b4aae

Merge remote-tracking branch 'origin/master'

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

 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

@@ -1,7 +1,7 @@
// WebSocketService.js



let socket = null;

let messages = '';

let messages='' ;

export const initializeWebSocket = (socketUrl, messageHandler) => {

    if (typeof WebSocket === "undefined") {

      console.log("Your browser does not support WebSocket");

@@ -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/PurchaseReturn/purchaseReturn.vue

@@ -16,7 +16,7 @@
const blind = ref(false)
const width = ref();
const height = ref();
const adjustedRects = ref([]);
const adjustedRects1 = ref([]);
const adjustedRects2 = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
@@ -26,7 +26,8 @@
const handleMessage = (data) => {
// 进炉中
  if(data.intoGlass!=null){
    adjustedRects.value =  data.intoGlass[0].map(rect => {  
    adjustedRects1.value =  data.intoGlass[0].map(rect => {  
      console.log( adjustedRects1.value);
        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
        let newX = rect.yCoordinate; 
  if (rect.angle === 0) {  
@@ -52,10 +53,13 @@
        heighta: adjustedHeighta,
      };  
      });
      }else{
        adjustedRects1.value = ''
      }
  if(data.intoGlass2!=null){
    adjustedRects2.value =  data.intoGlass2[0].map(rect => {  
        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
      console.log( adjustedRects2.value);
      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
      let newX = rect.yCoordinate; 
      if (rect.angle === 0) {  
          adjustedWidth = rect.height * 0.12;  
@@ -80,6 +84,8 @@
        heighta: adjustedHeighta,
      };  
      });
      }else{
        adjustedRects2.value = ''
      }
  // 进炉前
  if(data.waitingGlass!=null){
@@ -109,7 +115,9 @@
    heighta: adjustedHeighta,
  };  
});
  }
  }else{
        adjustedRectsa.value = ''
      }
    // 已出炉
  if(data.outGlass!=null){
    adjustedRectsb.value = data.outGlass[0].map(rect => {  
@@ -138,7 +146,9 @@
        heighta: adjustedHeighta,
  };  
});
  }
  }else{
        adjustedRectsb.value = ''
      }
};
onMounted(() => {
  initializeWebSocket(socketUrl, handleMessage);
@@ -172,6 +182,18 @@
      return '#911005';  
  }  
}
// if (adjustedRectsb[0].engineerId != null) {
//     engineerIdDisplayb = adjustedRectsb[0].engineerId
//   }
//   if (adjustedRectsa[0].engineerId != null) {
//     engineerIdDisplaya = adjustedRectsa[0].engineerId
//   }
//   if (adjustedRects2[0].engineerId != null) {
//     engineerIdDisplay2 = adjustedRects2[0].engineerId
//   }
//   if (adjustedRects[0].engineerId != null) {
//     engineerIdDisplay = adjustedRects[0].engineerId
//   }
function showDialog(rect) {  
  currentGlassId.value = rect.glassId;  
  currenttemperingFeedSequence.value = rect.temperingFeedSequence;  
@@ -214,12 +236,13 @@
<div v-if="dialogFormVisible" >
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
<div style="width: 49%;float: left;background-color: #f4f4f5;height: 550px;">
    <div v-if="adjustedRects.length > 0">
      <div style="text-align: center;">炉号：{{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>  
    <div v-if="adjustedRects1.length > 0">
      <!-- <div style="text-align: center;">炉号：{{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
    <div style="text-align: center;"> 炉号：{{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
    <el-scrollbar height="550px" style="background-color: #e9e9eb;">
    <div  style="position: relative;max-width: 1400px;">  
      <div  
      v-for="(rect, index) in adjustedRects"
      v-for="(rect, index) in adjustedRects1"
      :key="index"  
      @click="showDialog(rect)"  
      class="rect"
@@ -242,12 +265,13 @@
  </div>
<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
    <div v-if="adjustedRects2.length > 0">
      <div style="text-align: center;">炉号：{{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>  
    <div style="text-align: center;"> 炉号：{{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
    <!-- <div style="text-align: center;">炉号：{{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
    <el-scrollbar height="550px" style="background-color: #e9e9eb;">
    <div  style="position: relative;max-width: 1400px;">  
      <div  
      v-for="(rect, index) in adjustedRects2"
      :key="index"  
      :key="index"
      @click="showDialog(rect)"  
      class="rect"
      :style="{ position: 'absolute', 
@@ -273,7 +297,8 @@
  <!-- 进炉前 -->
  <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
    <div v-if="adjustedRectsa.length > 0">
      <div style="text-align: center;">炉号：{{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>  
    <div style="text-align: center;"> 炉号：{{ adjustedRectsa[0].engineerId }}-{{ adjustedRectsa[0].temperingLayoutId }} </div>
    <!-- <div style="text-align: center;">炉号：{{ engineerIdDisplaya }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
      <el-scrollbar height="550px" style="background-color: #e9e9eb;">
    <div  style="position: relative;max-width: 1400px;">  
      <div  
@@ -299,7 +324,8 @@
  <!-- 已出炉 -->
  <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
      <div v-if="adjustedRectsb.length > 0">
      <div style="text-align: center;">炉号：{{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>  
    <div style="text-align: center;"> 炉号：{{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
    <!-- <div style="text-align: center;">炉号：{{ engineerIdDisplayb }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
      <el-scrollbar height="550px" style="background-color: #e9e9eb;">
    <div  style="position: relative;max-width: 1400px;">  
      <div  

 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,10 +610,10 @@
}
    } else {  
      // 处理错误情况或无效数据  
      console.error('接收到的数据无效', data);  
      // console.error('接收到的数据无效', data);  
    }  
  } catch (error) {  
    console.error('解析WebSocket消息时发生错误', error);  
    // console.error('解析WebSocket消息时发生错误', error);  
  }  
};  
const confirmCutting = async () => {  

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -32,10 +32,14 @@
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        wrapper.select("Top 1 *").eq("state",1);
        TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
        QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
        glassinfo.eq("engineer_id",glass.getEngineerId())
                .eq("tempering_layout_id", glass.getTemperingLayoutId());
        return temperingMapper.selectList(glassinfo);
        if(glass!=null) {
            QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
            glassinfo.eq("engineer_id", glass.getEngineerId())
                    .eq("tempering_layout_id", glass.getTemperingLayoutId());
            return temperingMapper.selectList(glassinfo);
        }else {
            return null;
        }
    }

    @Override
@@ -55,11 +59,14 @@
        wrap.select("Top 1 *").eq("state",3);
        TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
        //根据工程号和版图获取数据
        QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
        wapper.eq("engineer_id",glass.getEngineerId())
                .eq("tempering_layout_id", glass.getTemperingLayoutId())
                .orderByAsc("tempering_layout_id","tempering_feed_sequence");
        return temperingMapper.selectList(wapper);
        if(glass != null) {
            QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
            wapper.eq("engineer_id", glass.getEngineerId())
                    .eq("tempering_layout_id", glass.getTemperingLayoutId())
                    .orderByAsc("tempering_layout_id", "tempering_feed_sequence");
            return temperingMapper.selectList(wapper);
        }
            return  null;
    }

    @Override

 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();
        jsonObject.append("prioritylist", upPattenUsages);
        if(upPattenUsages!=null){
            jsonObject.append("prioritylist", upPattenUsages);
        }

        //工位信息
        List<UpWorkstation> upWorkstations = upWorkstationService.list();
        jsonObject.append("list", upWorkstations);
@@ -145,8 +148,8 @@
    public void loadGlassStatus() {
        JSONObject jsonObject = new JSONObject();
        //正在进行的任务
        String inkageStatus = plcParameterObject.getPlcParameter("MesToPlc").getValue();
        //String inkageStatus ="1";
        String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
//        String inkageStatus ="1";
        jsonObject.append("InkageStatus", inkageStatus);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
        if (sendwServer != null) {

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

@@ -30,7 +30,10 @@
        JSONObject jsonObject = new JSONObject();
        //正在等待进片的玻璃
        List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass();
        jsonObject.append("waitingGlass", waitingGlass);
        if(waitingGlass!=null){
            jsonObject.append("waitingGlass", waitingGlass);
        }

        //获取整在炉中的两个版图id
        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
        //进炉中的玻璃
@@ -45,11 +48,16 @@
        }
        //出炉后的玻璃
        List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
        jsonObject.append("outGlass", outGlass);
        if(outGlass!=null){
            jsonObject.append("outGlass", outGlass);
        }

        //过旋转台钢化后的玻璃
        List<TemperingGlassInfo> overGlass = temperingAgoService.selectOverGlass();
        if (outGlass != null) {
            jsonObject.append("overGlass", overGlass);
        }

        jsonObject.append("overGlass", overGlass);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
        if (sendwServer != null) {