#

lsh

2024-02-15 554a833b682f4052d7297c633cf4dd68818a33f2

#

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>jtwcs</finalName>
        <finalName>yxwcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/core/MainProcess.java

@@ -48,7 +48,7 @@
                    //初始化RGV地图
//                    mainService.initRgvMap();
                    //刷新RGV地图
                    mainService.refreshRgvMap();
//                    mainService.refreshRgvMap();
                    // 演示
//                    mainService.crnDemoOfLocMove1();
                    // 入出库模式切换函数
@@ -73,39 +73,39 @@
                    // 入库  ===>> 执行对工作档的完成操作
                    mainService.storeFinished();

                    /////////////////////////////////////RGV调度/////////////////////////////////////
                    i++;
                    k++;
                    if (i<7) {
                        // RGV  ===>>  小车任务作业下发
                        try{
                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
                            if (rgvIoExecuteSign){
                                k = 0;
                            } else if (k>7){
                                k = 0;
                                mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
                            }
                        }catch (Exception e){
                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
                        }
                    }else {
                        i = 0;
                    }
                    //完成小车任务
                    mainService.rgvCompleteWrkMastSta();
                    /////////////////////////////////////RGV调度/////////////////////////////////////
//                    /////////////////////////////////////RGV调度/////////////////////////////////////
//                    i++;
//                    k++;
//                    if (i<7) {
//                        // RGV  ===>>  小车任务作业下发
//                        try{
//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
//                            if (rgvIoExecuteSign){
//                                k = 0;
//                            } else if (k>7){
//                                k = 0;
//                                mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
//                            }
//                        }catch (Exception e){
//                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
//                        }
//                    }else {
//                        i = 0;
//                    }
//                    //完成小车任务
//                    mainService.rgvCompleteWrkMastSta();
//                    /////////////////////////////////////RGV调度/////////////////////////////////////

                    // 异常信息记录
                    mainService.recErr();
                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货  2楼
                    mainService.storeEmptyPlt();
                    // 入库  ===>> 空栈板初始化入库,1楼叠盘机空板入库
                    mainService.storeEmptyPlt3();
                    // 入库  ===>> 空栈板初始化入库,1楼叠盘机叠盘
                    mainService.storeEmptyPlt2();
                    // 拣料、并板、盘点再入库拆盘区   1楼拆垛位置  空板叠盘
                    mainService.storeEmptyPlt4();
//                    // 异常信息记录
//                    mainService.recErr();
//                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货  2楼
//                    mainService.storeEmptyPlt();
//                    // 入库  ===>> 空栈板初始化入库,1楼叠盘机空板入库
//                    mainService.storeEmptyPlt3();
//                    // 入库  ===>> 空栈板初始化入库,1楼叠盘机叠盘
//                    mainService.storeEmptyPlt2();
//                    // 拣料、并板、盘点再入库拆盘区   1楼拆垛位置  空板叠盘
//                    mainService.storeEmptyPlt4();
                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();
                    // 其他  ===>> LED显示器复位，显示默认信息
@@ -124,18 +124,18 @@
//                    //拆盘机处空板扫码，驱动托盘向码垛位，不入库
//                    mainService.scanBarcodeEmptyBoard();

                    //码垛完成驱动托盘下一步扫码入库
                    mainService.stackingCompletionDriveTray();
                    //拆垛完成继续下一步  出库至月台出库口
                    mainService.stackingCompletionDriveTray2();
                    //贴标完成继续下一步
//                    mainService.stackingCompletionDriveTray3();
                    //拆垛完成继续下一步  运行途中自动避让空板
                    mainService.stackingCompletionDriveTray4();
                    //拆垛完成托盘继续下一步
                    mainService.stackingCompletionDriveTrayOk2();
                    //退货码垛完成托盘继续下一步
                    mainService.stackingCompletionDriveTrayOk3();
//                    //码垛完成驱动托盘下一步扫码入库
//                    mainService.stackingCompletionDriveTray();
//                    //拆垛完成继续下一步  出库至月台出库口
//                    mainService.stackingCompletionDriveTray2();
//                    //贴标完成继续下一步
////                    mainService.stackingCompletionDriveTray3();
//                    //拆垛完成继续下一步  运行途中自动避让空板
//                    mainService.stackingCompletionDriveTray4();
//                    //拆垛完成托盘继续下一步
//                    mainService.stackingCompletionDriveTrayOk2();
//                    //退货码垛完成托盘继续下一步
//                    mainService.stackingCompletionDriveTrayOk3();

                } catch (Exception e) {
                    e.printStackTrace();

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -50,8 +50,8 @@
        add(112);add(113);add(114);add(115);
        add(116);add(117);add(118);add(119);
        add(120);add(121);add(122);add(123);
//        add(124);add(125);add(126);add(127);
        add(130);add(131);
        add(124);add(125);add(126);add(127);
        add(128);add(129);add(130);add(131);
        add(132);add(133);add(134);add(135);
        add(136);add(137);add(138);add(139);
        add(140);add(141);add(142);add(143);

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:49977;databasename=srjtasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
    username: sa
    password: sa@123
  mvc:
@@ -36,7 +36,7 @@
  enable: false

wms:
  url: localhost:8080/jtwms
  url: localhost:8080/yxwms

# 下位机配置
wcs-slave:
@@ -49,7 +49,7 @@
  # 堆垛机1
  crn[0]:
    id: 1
    ip: 192.168.18.13
    ip: 10.10.10.120
    port: 102
    rack: 0
    slot: 0
@@ -87,7 +87,7 @@
  # 堆垛机2
  crn[1]:
    id: 2
    ip: 192.168.18.21
    ip: 10.10.10.130
    port: 102
    rack: 0
    slot: 0
@@ -236,44 +236,6 @@
      row: 18
      bay: 1
      lev: 2
  # 堆垛机6
  crn[5]:
    id: 6
    ip: 192.168.18.53
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 117
      row: 23
      bay: 1
      lev: 1
    # 堆垛机入库站点
    crnInStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 211
      row: 23
      bay: 1
      lev: 2
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 115
      row: 22
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[1]:
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 210
      row: 22
      bay: 1
      lev: 2

  # RGV穿梭车1
  rgv[0]:
@@ -335,7 +297,7 @@
  # 输送线
  devp[0]:
    id: 1
    ip: 192.168.18.71
    ip: 10.10.10.100
    port: 102
    rack: 0
    slot: 0

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/jtwcs";
var baseUrl = "/yxwcs";

// 赋值
function setVal(el, val) {