1
zhang
2025-06-16 962c3a2d98cb40347d1ea0540c80a63972d1ea5b
1
10个文件已修改
96 ■■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/license.lic 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console.map.js 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console1.map.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console2.map.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console3.map.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wms/js/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/realtimeWatch/console.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -200,7 +200,7 @@
    </dependencies>
    <build>
        <finalName>scwcs</finalName>
        <finalName>wcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 9090
  servlet:
    context-path: /@pom.build.finalName@
@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=czscwcs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzmsewcs
    username: sa
    password: sa@123
  mvc:
@@ -37,7 +37,7 @@
#License相关配置
license:
  subject: scwcs
  subject: tzmsewcs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic
src/main/resources/license.lic
Binary files differ
src/main/webapp/static/wcs/js/common.js
@@ -1,4 +1,4 @@
var baseUrl = "/scwcs";
var baseUrl = "/wcs";
// 赋值
function setVal(el, val) {
src/main/webapp/static/wcs/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
    "mapName": "scwcs",
    "mapName": "wcs",
    "rackCount": 13,
    "crnCount": 4,
    "stbCount": 4,
@@ -7,17 +7,17 @@
    "minBayNo": 1,
    "floors": 1,
    "racks": [
    //     {
    //     "type": "rack",
    //     "id": "rack7",
    //     "top": 326,
    //     "left": 800,
    //     "width": 795,
    //     "height": 23,
    //     "minBayNo": 1,
    //     "maxBayNo": 50,
    //     "hiddenArr": [1,22]
    // },
        {
        "type": "rack",
        "id": "rack7",
        "top": 326,
        "left": 800,
        "width": 795,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 50,
        "hiddenArr": [1,22]
    },
        {
        "type": "rack",
        "id": "rack6",
@@ -29,17 +29,17 @@
        "maxBayNo": 59,
        "hiddenArr": [1,59]
    },
    //     {
    //     "type": "rack",
    //     "id": "rack5",
    //     "top": 209,
    //     "left": 820,
    //     "width": 1050,
    //     "height": 23,
    //     "minBayNo": 1,
    //     "maxBayNo": 59,
    //     "hiddenArr": [1,59]
    // },
        {
        "type": "rack",
        "id": "rack5",
        "top": 209,
        "left": 820,
        "width": 1050,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "hiddenArr": [1,59]
    },
        {
        "type": "rack",
        "id": "rack4",
@@ -96,15 +96,7 @@
    //     "hiddenArr": [1,59]
    // }
    ],
    "crns": [{
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 268,
        "left": 855,
        "width": 93,
        "height": 22
    }, {
    "crns": [ {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
@@ -112,15 +104,7 @@
        "left": 855,
        "width": 93,
        "height": 22
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 278,
        "left": 769,
        "width": 850,
        "height": 2
    }, {
    },{
        "type": "track",
        "id": "lb_track1",
        "text": "",
src/main/webapp/static/wcs/js/console1.map.js
@@ -1,5 +1,5 @@
mapInfo = {
    "mapName": "scwcs",
    "mapName": "wcs",
    "rackCount": 13,
    "crnCount": 4,
    "stbCount": 4,
src/main/webapp/static/wcs/js/console2.map.js
@@ -1,5 +1,5 @@
mapInfo = {
    "mapName": "scwcs",
    "mapName": "wcs",
    "rackCount": 13,
    "crnCount": 4,
    "stbCount": 4,
src/main/webapp/static/wcs/js/console3.map.js
@@ -1,5 +1,5 @@
mapInfo = {
    "mapName": "scwcs",
    "mapName": "wcs",
    "rackCount": 13,
    "crnCount": 4,
    "stbCount": 4,
src/main/webapp/static/wms/js/common.js
@@ -1,4 +1,4 @@
var baseUrl = "/scwcs";
var baseUrl = "/wcs";
// 详情窗口-高度
var detailHeight = '80%';
src/main/webapp/views/realtimeWatch/console.html
@@ -31,12 +31,12 @@
                <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
            </div>
        </div>
        <select onchange="window.open(this.value)">
            <option value = "console1.html">--成品一楼--</option>
            <option value="console2.html" >-半成品二楼-</option>
            <option value="console3.html">-成品二楼-</option>
            <option value="console.html"selected ="selected">-半成品一楼-</option>
        </select>
<!--        <select onchange="window.open(this.value)">-->
<!--            <option value = "console1.html">&#45;&#45;成品一楼&#45;&#45;</option>-->
<!--            <option value="console2.html" >-半成品二楼-</option>-->
<!--            <option value="console3.html">-成品二楼-</option>-->
<!--            <option value="console.html"selected ="selected">-半成品一楼-</option>-->
<!--        </select>-->
        <!-- 货架 + 堆垛机 + 入库站点 -->
        <div class="main-part">