Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

ZengTao

2024-07-03 b7533c1472fd129bdf19a99c5f8255b647a59b0e

Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

 UI-Project/src/views/GlassStorage/MaterialRackManagement.vue

@@ -6,7 +6,7 @@
<!-- 左侧按钮组 -->

<div >

  <el-button type="success" size="mini" @click="handleInbound()">入库</el-button>

  <el-button type="success" size="mini" @click="handleInbound()">吊装位入库</el-button>

  <el-button type="success" size="mini" >吊装位入库</el-button>

 

</div>



@@ -48,7 +48,7 @@
  prop="shelf_status"

>

  <template #default="scope">

    <el-tag :type="getTagType(scope.row.shelf_status)">

        <el-tag :type="getTagType(scope.row.shelf_status)" @click="toggleStatus(scope.row)">

      {{ scope.row.shelf_status === 1 ? '启用' : '未启用' }}

    </el-tag>

  </template>

@@ -104,7 +104,7 @@
    <el-table-column label="操作" width="350">

      <template #default="{ row }">

        <el-button type="primary" size="mini" @click="handleRestart(row)">重新开始</el-button>

        <el-button type="danger" size="mini" @click="handleDelete(row)">删除任务</el-button>

        <el-button type="danger" size="mini" @click="handleDeletetask(row)">删除任务</el-button>

        <el-button type="success" size="mini" @click="handleComplete(row)">任务完成</el-button>

      </template>

    </el-table-column>

@@ -198,7 +198,7 @@
  </el-dialog>



  <el-dialog title="编辑" v-model="editdialogVisible" width="30%" @close="edithandleDialogClose">

      <el-form :model="editForm" ref="editForm" label-width="80px">

      <el-form :model="editForm" ref="editFormRef" label-width="80px">

        <el-form-item label="数量">

          <el-input v-model="editForm.quantity"></el-input>

        </el-form-item>

@@ -207,7 +207,7 @@
        </el-form-item>

      </el-form>



      <div slot="footer" class="dialog-footer">

      <div  class="dialog-footer">

        <el-button @click="editdialogVisible = false">取消</el-button>

        <el-button type="primary" @click="editsaveEdit">保存</el-button>

      </div>

@@ -224,6 +224,7 @@
<script setup>

import { ref, onMounted, onBeforeUnmount } from 'vue'; // 导入 Vue 3 的模块

import * as echarts from 'echarts';

import { ElMessage, ElMessageBox } from 'element-plus'





    const loading = ref(false);

@@ -235,7 +236,7 @@
        height: '50',

        thickness: '10',

        quantity: '5',

        entry_time: '2024-06-19',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

@@ -246,7 +247,7 @@
        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-18',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 0

      },

@@ -257,7 +258,7 @@
        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-18',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

@@ -268,7 +269,7 @@
        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-18',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      },

@@ -279,7 +280,7 @@
        height: '60',

        thickness: '12',

        quantity: '10',

        entry_time: '2024-06-18',

        entry_time: '2024-06-19 10:00:00',

        batchnumber:"444",

        shelf_status: 1

      }

@@ -305,6 +306,12 @@
      return status === 1 ? 'success' : 'danger';

      // 根据状态值决定标签类型，这里假设状态为1时为成功（绿色），否则为失败（红色）

    }



    const toggleStatus = (row) => {

      // 切换料架状态的逻辑

      row.shelf_status = 1 - row.shelf_status; // Toggle between 0 and 1

      // 此处可以添加保存状态的逻辑，比如调用 API 更新数据

    };



   const tasktableData=ref([



@@ -342,12 +349,37 @@
    });



   

    const handleDelete = (row) => {

  // 使用 Element UI 的 MessageBox.confirm 方法进行二次确认

  ElMessageBox.confirm('确定要执行删除操作吗？', '确认删除', {

    confirmButtonText: '确认',

    cancelButtonText: '取消',

    type: 'warning',

  }).then(() => {

    // 点击确认按钮的回调，执行出库操作

    console.log('执行删除操作', row);

  }).catch(() => {

    // 点击取消按钮的回调，不执行任何操作

    console.log('取消删除操作');

  });

};



    

    const handleCheckout = (row) => {

      // 处理出库逻辑

      console.log('Checkout:', row);

  // 使用 Element UI 的 MessageBox.confirm 方法进行二次确认

  ElMessageBox.confirm('确定要执行出库操作吗？', '确认出库', {

    confirmButtonText: '确认',

    cancelButtonText: '取消',

    type: 'warning',

  }).then(() => {

    // 点击确认按钮的回调，执行出库操作

    console.log('执行出库操作', row);

  }).catch(() => {

    // 点击取消按钮的回调，不执行任何操作

    console.log('取消出库操作');

  });

    };





    const handleInbound = () => {

      // 打开入库对话框

@@ -421,12 +453,13 @@
      quantity: '',

      batchnumber: ''

    });

    const editFormRef = ref(null);

    let currentRow = ref(null);



    // 处理行点击事件

    const edithandleRowClick = (row) => {

      currentRow.value = row;

      editForm.value.quantity = row.quantity;

      editForm.value.quantity = row.quantity.toString();

      editForm.value.batchnumber = row.batchnumber;

      editdialogVisible.value = true;

      console.log(editForm.value)

@@ -452,6 +485,82 @@
    };











    




    const handleRestart = (row) => {

  // 使用 Element UI 的 MessageBox.confirm 方法进行二次确认

  ElMessageBox.confirm('确定要执行重新开始操作吗？', '确认重新开始', {

    confirmButtonText: '确认',

    cancelButtonText: '取消',

    type: 'warning',

  }).then(() => {

    // 点击确认按钮的回调

    console.log('执行重新开始操作', row);

  }).catch(() => {

    // 点击取消按钮的回调，不执行任何操作

    console.log('取消重新开始操作');

  });

};





const handleDeletetask = (row) => {

  // 使用 Element UI 的 MessageBox.confirm 方法进行二次确认

  ElMessageBox.confirm('确定要执行删除任务操作吗？', '确认删除任务', {

    confirmButtonText: '确认',

    cancelButtonText: '取消',

    type: 'warning',

  }).then(() => {

    // 点击确认按钮的回调

    console.log('执行删除任务操作', row);

  }).catch(() => {

    // 点击取消按钮的回调，不执行任何操作

    console.log('取消删除任务操作');

  });

};







const handleComplete = (row) => {

  // 使用 Element UI 的 MessageBox.confirm 方法进行二次确认

  ElMessageBox.confirm('确定要执行任务完成操作吗？', '确认任务完成', {

    confirmButtonText: '确认',

    cancelButtonText: '取消',

    type: 'warning',

  }).then(() => {

    // 点击确认按钮的回调

    console.log('执行任务完成操作', row);

  }).catch(() => {

    // 点击取消按钮的回调，不执行任何操作

    console.log('取消任务完成操作');

  });

};















































    let chartInstance = null;



onMounted(() => {


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java

@@ -18,12 +18,20 @@
     * 磨边清洗前
     */
    /**
     * A09出片目标位置  d02卧转立 钢化出片    2001
     * A10出片目标位置  d05卧转立 人工出片    2002
     * A09出片目标位置  d02卧转立    2001
     * A10出片目标位置  d05卧转立    2002
     */
    public static final Integer A09_OUT_TARGET_POSITION = 2001;
    public static final Integer A10_OUT_TARGET_POSITION = 2002;


    /**
     * A09出片目标位置  d02卧转立 钢化出片    3001
     * A10出片目标位置  d05卧转立 人工出片    3002
     */
    public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
    public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;

    /**
     * 卧式理片笼详情表玻璃状态
     * 识别后成功状态100

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java

@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.List;
@@ -102,7 +103,14 @@
     * @return
     */
    private String saveRoleMenu(Long roleId, List<SysMenu> menuList) {
        log.info("配置角色菜单关心");
        log.info("配置角色菜单关系");
        if (CollectionUtils.isEmpty(menuList)) {
            // 先删除原来的记录，再保存新的
            sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
            // 删除缓存
            sysUserService.clearUserAuthorityInfoByRoleId(roleId);
            return "success";
        }
        List<SysRoleMenu> roleMenuList = menuList.stream().map(menu -> {
            SysRoleMenu roleMenu = new SysRoleMenu();
            roleMenu.setRoleId(roleId);
@@ -110,12 +118,9 @@
            return roleMenu;
        }).collect(Collectors.toList());
        log.info("清空角色权限表中该角色信息");


        // 先删除原来的记录，再保存新的
        sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
        sysRoleMenuService.saveBatch(roleMenuList);

        // 删除缓存
        sysUserService.clearUserAuthorityInfoByRoleId(roleId);
        return "success";

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java

@@ -40,7 +40,7 @@
    /**
     * 启用状态
     */
    private String enableState;
    private Integer enableState;

    /**
     * 剩余

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

@@ -56,14 +56,8 @@
    @Value("${mes.minCount}")
    private int minCount;

    @Value("${mes.carWidth}")
    private Integer carWidth;

    @Value("${mes.slotWidth}")
    private Integer slotWidth;

    @Value("${mes.carMaxSize}")
    private Integer carMaxSize;

    @Value("${mes.galssGap}")
    private Integer galssGap;

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java

@@ -14,7 +14,7 @@
public class S7object extends Thread {
    public S7control plccontrol; // PLC通讯类实例
    private EPlcType plcType = EPlcType.S1200; // 西门子PLC类型
    private String ip = "192.168.20.100"; // plc ip地址
    private String ip = "192.168.20.2"; // plc ip地址
    private int port = 102; // plc 端口号



 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java

@@ -81,7 +81,7 @@
    @Value("${mes.galssGap}")
    private Integer galssGap;

    //    @Scheduled(fixedDelay = 5000)
    @Scheduled(fixedDelay = 5000)
    public void plcToHomeEdgScan() {
        PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
        String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
@@ -224,14 +224,14 @@
                .orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
        if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
            log.info("有正在出片的钢化任务");
            computeOutGlassInfo(temperingGlassInfoList);
            computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE);
            return;
        }
        //是否有人工下片任务   有直接出
        List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
        if (CollectionUtils.isNotEmpty(artificialList)) {
            computeOutGlassInfo(temperingGlassInfoList);
            computeOutGlassInfo(temperingGlassInfoList, Boolean.FALSE);
            return;
        }
        //钢化优先：获取理片笼  玻璃小片  破损表 数量   判断笼内版图是否到齐
@@ -248,7 +248,7 @@
                    .eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
                    .eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId()));
            temperingGlassInfoService.saveBatch(temperingGlassInfos);
            computeOutGlassInfo(temperingGlassInfoList);
            computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE);
            return;
        }
        //未到齐 执行内部调度任务
@@ -401,7 +401,7 @@
            //2、获取目标格子信息
            BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
            //3、更新大理片笼表剩余宽度
            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth())
            bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - info.getWidth())
                    .eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
            //4、更新进片任务表，目标格子及状态（状态改为2 电气扫到自行处理）  遇到问题：无法批量更新，批量更新无法走指定从库
            e.setTargetSlot(bigStorageDTO.getSlot());
@@ -430,7 +430,7 @@
        s7control.writeWord(outLine, (short) 1);
    }

    private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list) {
    private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering) {
        //任务数据  获取车子存放玻璃最大数量  玻璃间隔
        List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
        //打车剩余尺寸
@@ -440,8 +440,14 @@
                break;
            }
            remainWidth = remainWidth - (int) e.getWidth() - galssGap;
            bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.A09_OUT_TARGET_POSITION,
                    (int) e.getWidth(), 0, 0, 1));
            if (isTempering) {
                bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
                        (int) e.getWidth() * 10, 0, 0, 1));
            } else {
                bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
                        (int) e.getWidth() * 10, 0, 0, 1));
            }

        }
        Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务");
        log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size());

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-cz.yml

@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        salve_hangzhoumes_1:
          url: jdbc:sqlserver://192.168.20.2:1433;databasename=hangzhoumes
          url: jdbc:sqlserver://192.168.20.24:1433;databasename=hangzhoumes
          username: sa
          password: beibo.123/
  cloud:

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml

@@ -4,25 +4,13 @@
      primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
#        hangzhoumes:
#          url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8
#          username: root
#          password: beibo.123/
#          driver-class-name: com.mysql.cj.jdbc.Driver
#
#        salve_hangzhoumes:
#          url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes
#          username: sa
#          password: beibo.123/
#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        hangzhoumes:
          url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
          url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

        salve_hangzhoumes:
          url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
          url: jdbc:sqlserver://192.168.20.24:1433;databasename=hangzhoumes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java

@@ -2,6 +2,7 @@


import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +29,8 @@

    @PostMapping("/generateOutGlassTask")
    @ApiOperation(value = "生成出片任务", notes = "生成出片任务")
    public Result<Boolean> generateOutGlassTask(@RequestBody String glassId) {
        return Result.success(downGlassInfoService.generateOutGlassTask(glassId));
    public Result<Boolean> generateOutGlassTask(@RequestBody DownStorageCageDetails downStorageCageDetails) {
        return Result.success(downGlassInfoService.generateOutGlassTask(downStorageCageDetails.getGlassId()));
    }

}

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java

@@ -35,7 +35,7 @@
    public Integer getMaxSequenceByFlowCardId(String flowCardId, int layer) {
        LambdaQueryWrapper<DownGlassInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
        lambdaQueryWrapper.eq(DownGlassInfo::getFlowCardId, flowCardId)
                .eq(DownGlassInfo::getLayer, flowCardId)
                .eq(DownGlassInfo::getLayer, layer)
                .select(DownGlassInfo::getSequence)
                .orderByDesc(DownGlassInfo::getSequence)
                .last("LIMIT 1");

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java

@@ -50,7 +50,7 @@
     */
    @ApiModelProperty(value = "启用状态", position = 5)
    @TableField("enable_state")
    private String enableState;
    private Integer enableState;

    /**
     * 剩余

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java

@@ -167,7 +167,7 @@
                log.info("无空架子,获取已绑定架子的流程卡信息,查看玻璃信息是否可被对调");
                List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.FALSE);
                log.info("获取架子上已绑定流程卡落架的数量及未落架的玻璃数据：{}", downGlassInfoDTOList);
                if (CollectionUtils.isNotEmpty(downGlassInfoDTOList)) {
                if (CollectionUtils.isEmpty(downGlassInfoDTOList)) {
                    log.info("已绑定流程卡均无未落架玻璃，请及时处理架子上的玻璃，清除流程卡,执行进片任务");
                } else {
                    //替换玻璃信息

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-cz.yml

@@ -10,7 +10,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_hangzhoumes:
          url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes
          url: jdbc:sqlserver://192.168.30.101:1433;databasename=hangzhoumes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java

@@ -1,6 +1,7 @@
package mes;

import com.mes.UnLoadGlassApplication;
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
import com.mes.downglassinfo.service.impl.DownGlassTaskServiceImpl;
@@ -37,7 +38,7 @@
 */
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = UnLoadGlassApplication.class)
@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

public class UnloadGlassModuleApplicationTest {

@@ -61,6 +62,8 @@
    DownStorageCageService downStorageCageService;
    @Autowired
    DownGlassTaskService downGlassTaskService;
    @Autowired
    DownGlassInfoService downGlassInfoService;



@@ -153,7 +156,7 @@
    public void getMaxSequenceByFlowCardId() {
        log.info("最大序号");

        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
    }

    @Test
@@ -182,7 +185,8 @@
    public void getUnloadingTaskState() {


        downGlassTaskService.getUnloadingTaskState();
        downGlassInfoService.generateOutGlassTask("NG24031401A01-4-3-1-3");
        //downGlassTaskService.getUnloadingTaskState();
    }

    @Test