Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

ZengTao

2025-03-17 f87f14a9aea395831edb8fb2e709ceaf274aa632

Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

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

@@ -84,24 +84,17 @@
  if (data.LoadOneState != null) {
    cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
  }
  if (data.stationOne != null) {
    data.stationOne[0].forEach((station) => {
      if(station.patternThickness !== undefined){
        station.haspatternThickness=false;
      }else{
        station.haspatternThickness=true;
      }
      // stationInfos[station.patternThickness] = {
      //   haspatternThickness: station.patternThickness !== undefined,
      // };
    });
    
    console.log(data.stationOne);
    if (data.list != null) {
      tableDataa.value = data.list[0].slice(0, 2);
    } else {
      tableDataa.value = [];
    }
if (data.stationOne!=null) {
    const processedData = [...data.stationOne[0]];
 if (processedData.length > 0) {
   processedData[0] = { ...processedData[0], workstationId: 1 };
 }
 if (processedData.length > 1) {
   processedData[1] = { ...processedData[1], workstationId: 2 };
 }
  tableDataa.value = processedData;
  }else {
    tableDataa.value = []
  }
  if(data.loadTask1!=null){
  tableData.value = data.loadTask1[0]
@@ -506,7 +499,7 @@
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
            <template #default="scope">
          <el-button size="mini" :disabled="(!stationInfos[scope.row.patternThickness])" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
          <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
            </template>
        </el-table-column>
          </el-table>

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

@@ -73,8 +73,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
  if (data.list!=null) {
    const processedData = [...data.list[0].slice(2, 4)];
  if (data.stationTwo!=null) {
    const processedData = [...data.stationTwo[0]];
 if (processedData.length > 0) {
   processedData[0] = { ...processedData[0], workstationId: 1 };
 }
@@ -436,7 +436,7 @@
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;"  id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
    <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
    <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.twoloadingline')"
               style="margin-top: 5px;margin-left: 20px;">
      <el-option :label="$t('Mounting.all')" value="0"></el-option>
      <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
@@ -494,7 +494,7 @@
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
            <template #default="scope">
          <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
          <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
            </template>
        </el-table-column>
          </el-table>

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

@@ -226,7 +226,7 @@
                        .like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())
                        .like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())
                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(BigStorageCage::getDeviceId, query.getDeviceId())
//                .eq(BigStorageCage::getDeviceId, query.getDeviceId())
                .orderByAsc(BigStorageCage::getDeviceId)
                .orderByAsc(BigStorageCage::getSlot);
        return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java

@@ -49,7 +49,7 @@
                        .like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
                        .like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
                        .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
//                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
                .orderByAsc(HollowBigStorageCage::getDeviceId)
                .orderByAsc(HollowBigStorageCage::getSlot);
        return baseMapper.selectJoinList(HollowBigStorageAndDetailsDTO.class, wrapper);

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java

@@ -798,7 +798,7 @@
        }
        Assert.isFalse(CollectionUtil.isEmpty(templist), "未获取出片数据，结束出片任务");
        log.info("获取出片任务数据{}条，执行保存", templist.size());
        List<T> baseInfoList = new ArrayList<>();
        List<T> baseInfoList = templist;
        if (1 != isForce) {
            if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
                //校验防止小于等于总层数玻璃片序不匹配的问题，该问题多出现在大片玻璃，3层