Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-31 01b07fdef6c2117c3672b0d90b8b2f2218bdd659

Merge remote-tracking branch 'origin/master'

 UI-Project/src/views/NewPage.vue

@@ -22,10 +22,10 @@
       height: `${rect.height}px`,  
      backgroundColor:  'lightblue'}">
   <div  class="centered-text">
  <div style="font-size: 15px;font-weight: bold;">{{ rect.sort }}</div>  
  <div style="font-size: 15px;font-weight: bold;">{{ rect.process_id }}</div>  
  <div style="font-size: 15px;font-weight: bold;">{{ rect.project_no }}</div>  
  <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>  
  <div style="font-size: 10px;font-weight: bold;">{{ rect.sort }}</div>  
  <div style="font-size: 10px;font-weight: bold;">{{ rect.process_id }}</div>  
  <div style="font-size: 10px;font-weight: bold;">{{ rect.project_no }}</div>  
  <div style="font-size: 10px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>  
</div>
</div>
 </div>

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

@@ -37,6 +37,19 @@
const titleSelectJson = ref({
  engineerId: [],
})
const selectGong = async () => {
  try {
    const response = await request.post('/loadGlass/loadglassdevicetaskhistory/queryAllMessage',{
  redisRequest: 'loadGlassRequestOne',
  stationCell: 5,
  tableName: 'LOAD_GLASS_DEVICE_ONE_TASK',
  webSocketName: 'loadGlassOne'
});
    if (response.code == 200) {
    }
  } catch (error) {
  }
};
request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
  state: null,
  stationCell: 5
@@ -60,6 +73,7 @@
};
onMounted(() => {
  socket = initializeWebSocket(socketUrl, handleMessage);
  selectGong()
});
onUnmounted(() => {
  if (socket) {
@@ -110,7 +124,7 @@
};
const selectgong = async (queryString: string) => {
  try {
    const response = await request.post('/loadGlass/engineerScheduling/queryEngineerScheduling', {
    const response = await request.post('/loadGlass/optimizeProject/listByState', {
      ...requestData,
      query: queryString
    });

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

@@ -31,6 +31,19 @@
const titleSelectJson = ref({
  engineerId: [],
})
const selectGong = async () => {
  try {
    const response = await request.post('/loadGlass/loadglassdevicetaskhistory/queryAllMessage',{
  redisRequest: 'loadGlassRequestTwo',
  stationCell: 6,
  tableName: 'LOAD_GLASS_DEVICE_TWO_TASK',
  webSocketName: 'loadGlassTwo'
});
    if (response.code == 200) {
    }
  } catch (error) {
  }
};
request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{
  state: null,
  stationCell: 6
@@ -54,6 +67,7 @@
};
onMounted(() => {
  socket = initializeWebSocket(socketUrl, handleMessage);
  selectGong()
});
onUnmounted(() => {
  if (socket) {

 UI-Project/src/views/Slicecage/slicecage.vue

@@ -94,6 +94,14 @@
printLayer.value = row.layer
printGlassId.value = row.glassId
}
const selectGong = async () => {
  try {
    const response = await request.get('/cacheVerticalGlass/bigStorageCageHistoryTask/queryAllMessage');
    if (response.code == 200) {
    }
  } catch (error) {
  }
};
//     setInterval(() => {  
//     localStorage.clear(); // 清除所有localStorage数据  
// }, 60000);
@@ -710,28 +718,28 @@
  }
}
// 任务重置
const handleptask = async() => { 
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('searchOrder.partasks'), 
      t('workOrder.prompt'),  
      {  
        confirmButtonText: t('workOrder.yes'), 
        cancelButtonText: t('workOrder.cancel'),
        type: 'warning',  
      } 
    );
 if (confirmResult === 'confirm') {
  const response = await request.post('/cacheVerticalGlass/bigStorageCage/resetCage')
    if (response.code === 200) {
      ElMessage.success(response.message);
      } else {
      ElMessage.error(response.msg);
      }  
    }  
  } catch (error) {
  }  
}; 
// const handleptask = async() => { 
//   try {
//     const confirmResult = await ElMessageBox.confirm(  
//       t('searchOrder.partasks'), 
//       t('workOrder.prompt'),  
//       {  
//         confirmButtonText: t('workOrder.yes'), 
//         cancelButtonText: t('workOrder.cancel'),
//         type: 'warning',  
//       } 
//     );
//  if (confirmResult === 'confirm') {
//   const response = await request.post('/cacheVerticalGlass/bigStorageCage/resetCage')
//     if (response.code === 200) {
//       ElMessage.success(response.message);
//       } else {
//       ElMessage.error(response.msg);
//       }  
//     }  
//   } catch (error) {
//   }  
// }; 
// 警报确认
const handleSure = async (row) => {
  try {
@@ -1040,6 +1048,7 @@
  onMounted(() => {
  socket = initializeWebSocket(socketUrl, handleMessage);
  parseAndSetTime();
  selectGong()
});
  onUnmounted(() => {
    if (socket) {
@@ -1191,7 +1200,7 @@
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
    <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
    <div id="dotClass">

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -8,9 +8,9 @@
        <el-button id="searchButton" type="primary" @click="handlezhiban">
          {{ $t('hellow.createtask') }}
        </el-button>
        <el-button type="primary" @click="selectproject">
        <!-- <el-button type="primary" @click="selectproject">
          {{ $t('hellow.reviewproject') }}
        </el-button>
        </el-button> -->
        <el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{
          $t('searchOrder.historicaltasks') }}</el-button>
        <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">

 UI-Project/src/views/hollow/hollowequipmenttwo.vue

@@ -8,9 +8,9 @@
        <el-button id="searchButton" type="primary" @click="handlezhiban">
          {{ $t('hellow.createtask') }}
        </el-button>
        <el-button type="primary" @click="selectproject">
        <!-- <el-button type="primary" @click="selectproject">
          {{ $t('hellow.reviewproject') }}
        </el-button>
        </el-button> -->
        <el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{
          $t('searchOrder.historicaltasks') }}</el-button>
        <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">

 UI-Project/src/views/hollow/hollowslicecage.vue

@@ -451,28 +451,28 @@
  selectedRow.value = row; // 更新选中的行数据  
}
// 任务重置
const handleptask = async() => { 
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('searchOrder.partasks'), 
      t('workOrder.prompt'),  
      {  
        confirmButtonText: t('workOrder.yes'), 
        cancelButtonText: t('workOrder.cancel'),
        type: 'warning',  
      } 
    );
 if (confirmResult === 'confirm') {
  const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
    if (response.code === 200) {
      ElMessage.success(response.message);
      } else {
      ElMessage.error(response.msg);
      }  
    }  
  } catch (error) {
  }  
}; 
// const handleptask = async() => { 
//   try {
//     const confirmResult = await ElMessageBox.confirm(  
//       t('searchOrder.partasks'), 
//       t('workOrder.prompt'),  
//       {  
//         confirmButtonText: t('workOrder.yes'), 
//         cancelButtonText: t('workOrder.cancel'),
//         type: 'warning',  
//       } 
//     );
//  if (confirmResult === 'confirm') {
//   const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
//     if (response.code === 200) {
//       ElMessage.success(response.message);
//       } else {
//       ElMessage.error(response.msg);
//       }  
//     }  
//   } catch (error) {
//   }  
// }; 
// 调度开关
const handlediaodu = async () => {
  try  {
@@ -944,7 +944,7 @@
    <div style="display: flex;">
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
    <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
    <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
    <div style="display: flex;">
   <div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;">{{ $t('searchOrder.hollowPriority') }}：</div>

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java

@@ -25,14 +25,16 @@
    @Override
    public List<EngineerScheduling> listByState() {
        QueryWrapper<EngineerScheduling> wrapper = new QueryWrapper<>();
        wrapper.lt("type", 3);
        wrapper.lt("type", 3)
                .eq("state", 100);
        return baseMapper.selectList(wrapper);
    }

    @Override
    public List<EngineerScheduling> queryByType(Integer type) {
        QueryWrapper<EngineerScheduling> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("type", type);
        queryWrapper.eq("type", type)
                .orderByAsc("id");
        return baseMapper.selectList(queryWrapper);
    }


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -4,6 +4,8 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.engineerScheduling.entity.EngineerScheduling;
import com.mes.engineerScheduling.service.EngineerSchedulingService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -43,6 +45,9 @@
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    DamageService damageService;
    @Autowired
    EngineerSchedulingService engineerSchedulingService;



    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
@@ -76,6 +81,11 @@
    @ResponseBody
    public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
        try {
            //获取排产顺序，不是当前正在上片的工程号直接返回失败   暂时注释，等待排产功能正式上线
//            List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(1);
//            if (!engineerScheduling.get(0).getProjectNo().equals(engineering.getEngineerId())) {
//                return Result.build(100, "请根据当前排产顺序选择工程号，排产首位为：" + engineerScheduling.get(0).getProjectNo(), false);
//            }
            log.info("engineeringId:{}", engineering);
            UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
            Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());