自动化立库仓库-WCS系统
parent: 7d8b1dba | 补丁 | 提交 | ignore whitespace
tqs
2022-09-26 96868c07fba2beda4a33d4789abe43e01bafc61b 
Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
12个文件已修改
50 ■■■■■ 已修改文件
pom.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/LocMast.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/images/barcode.png 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/images/zy-logo.png 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console-old.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/console.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/control.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/monitor/monitor.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/monitor/monitor0.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 pom.xml


@@ -110,77 +110,77 @@


            <artifactId>5m3</artifactId>


            <scope>system</scope>


            <version>0.5.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>5m3message</artifactId>


            <scope>system</scope>


            <version>0.5.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>5m3doc</artifactId>


            <scope>system</scope>


            <version>0.5.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>rxtx</artifactId>


            <scope>system</scope>


            <version>2.1.7</version>


            <systemPath>${project.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>simple-xml</artifactId>


            <scope>system</scope>


            <version>2.7.1</version>


            <systemPath>${project.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>stax</artifactId>


            <scope>system</scope>


            <version>1.2.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>stax-api</artifactId>


            <scope>system</scope>


            <version>1.0.1</version>


            <systemPath>${project.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>uia-comm</artifactId>


            <scope>system</scope>


            <version>0.5.1</version>


            <systemPath>${project.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>uia-message</artifactId>


            <scope>system</scope>


            <version>0.6.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>uia-utils</artifactId>


            <scope>system</scope>


            <version>0.2.0</version>


            <systemPath>${project.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>


        </dependency>


        <dependency>


            <groupId>com.wcs.led</groupId>


            <artifactId>xpp3</artifactId>


            <scope>system</scope>


            <version>1.1.3.3</version>


            <systemPath>${project.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>


            <systemPath>${pom.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>


        </dependency>


    </dependencies>






 src/main/java/com/zy/asrs/domain/enums/PackStatusType.java


@@ -12,6 +12,8 @@


    LOC_WAIT_TESTINT("在库待测"),


    // 在库测试中


    LOC_TESTING("在库测试中"),


    // 测试完成


    LOC_TESTEND("测试完成"),


    // 在库静置中


    LOC_STAY("在库静置中"),


    // 静置完成


@@ -38,8 +40,10 @@


            } else if (packStatus == 2){


                return LOC_TESTING;


            } else if (packStatus == 3){


                return LOC_STAY;


                return LOC_TESTEND;


            } else if (packStatus == 4){


                return LOC_STAY;


            } else if (packStatus == 5){


                return LOC_STAY_OVER;


            }


        } else if (locSts.equals("O") || locSts.equals("S")){




 src/main/java/com/zy/asrs/entity/LocMast.java


@@ -312,8 +312,10 @@


            case 2:


                return "测试中";


            case 3:


                return "静置中";


                return "测试完成";


            case 4:


                return "静置中";


            case 5:


                return "静置完成";


            default:


                return String.valueOf(this.packStatus);




 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://192.168.4.15:1433;databasename=gzynasrs


    url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs


    username: sa


    password: sa@123


  mvc:


@@ -34,7 +34,7 @@


  enable: false




wms:


  url: localhost:8080/klswms


  url: localhost:8081/ynwms




# 下位机配置


wcs-slave:


@@ -90,7 +90,7 @@


  # 输送线


  devp[0]:


    id: 1


    ip: 10.10.10.50


    ip: 192.168.4.250


    port: 102


    rack: 0


    slot: 0




 src/main/webapp/static/images/barcode.png





 src/main/webapp/static/images/zy-logo.png





 src/main/webapp/views/console-old.html


@@ -22,7 +22,7 @@


            <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>


        </div>


        <div class="head-right">


            <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">


            <img src="../static/images/zy-logo.png" alt="wcs" height="44" width="80">


        </div>


    </div>






 src/main/webapp/views/console.html


@@ -22,7 +22,7 @@


            <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>


        </div>


        <div class="head-right">


            <img src="../static/images/zy-logo.png" alt="中扬" height="44" width="80">


            <img src="../static/images/zy-logo.png" alt="wcs" height="44" width="80">


        </div>


    </div>


    <!-- 货架 + 堆垛机 + 入库站点 -->




 src/main/webapp/views/control.html


@@ -84,7 +84,7 @@


    </main>




    <footer class="footer">


        Copyright © 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">浙江中扬立库技术有限公司</a>  保留所有权利


        Copyright © 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


    </footer>




</body>




 src/main/webapp/views/index.html


@@ -26,7 +26,7 @@


<!-- 主体内容 -->


<iframe id="content" src="console.html"></iframe>


<footer class="footer">


    Copyright © 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">浙江中扬立库技术有限公司</a>  保留所有权利


    Copyright © 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>


</footer>


</body>


<script>




 src/main/webapp/views/monitor/monitor.html


@@ -186,7 +186,7 @@


                    <div class="image-border image-border2"></div>


                    <div class="image-border image-border3"></div>


                    <div class="image-border image-border4"></div>


                    <span>浙江中扬立库技术有限公司</span>


                    <span>立库wcs操作平台</span>


                    <img src="../../static/image/barcode.png">


                </div>


            </div>




 src/main/webapp/views/monitor/monitor0.html


@@ -164,7 +164,7 @@


                    <div class="image-border image-border2"></div>


                    <div class="image-border image-border3"></div>


                    <div class="image-border image-border4"></div>


                    <span>浙江中扬立库技术有限公司</span>


                    <span>立库wcs操作平台</span>


                    <img src="../../static/image/barcode.png">


                </div>


            </div>