Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

luxiaotao1123

2020-11-10 ad464096f0983b315e9297d95d269cf6f82bfb7c

Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

 src/main/resources/application.yml

@@ -12,7 +12,7 @@
    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
    #username: sa
    #password: eisoft
    url: jdbc:sqlserver://localhost:1433;databasename=jsasrs
    url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
    username: sa
    password: sa@123
  mvc:
@@ -63,14 +63,14 @@
      bay: 0
      lev: 1
    # 堆垛机2
    crn[1]:
      id: 1
      ip: 192.168.6.10
      port: 102
      rack: 0
      slot: 0
      # 偏移量，当堆垛机站点列号=1时，偏移量=2
      offset: 2
#    crn[1]:
#      id: 1
#      ip: 192.168.6.10
#      port: 102
#      rack: 0
#      slot: 0
#      # 偏移量，当堆垛机站点列号=1时，偏移量=2
#      offset: 2
  # 输送线
  devp[0]:
    id: 1

 src/main/webapp/views/crn.html

@@ -109,7 +109,7 @@
                </div>
                <div class="select-container-item">
                    <span>排</span>
                    <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                    <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                </div>
                <div class="select-container-item">
                    <span>列</span>
@@ -117,7 +117,7 @@
                </div>
                <div class="select-container-item">
                    <span>层</span>
                    <label><input id="sourceLev" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                    <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                </div>
            </div>
        </div>
@@ -131,7 +131,7 @@
                </div>
                <div class="select-container-item">
                    <span>排</span>
                    <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                    <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                </div>
                <div class="select-container-item">
                    <span>列</span>
@@ -139,7 +139,7 @@
                </div>
                <div class="select-container-item">
                    <span>层</span>
                    <label><input id="lev" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
                    <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
                </div>
            </div>
        </div>