zy-wcs-master.git

parent: bd9d3057 | 补丁 | 提交 | show whitespace

skyouc

10 天以前 88bd084f2964d6fc4ac6527296e1602538deec30

no message

1个文件已添加

6个文件已修改

	docs/WCS部署手册.md	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pom.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/enums/CrnTaskModeType.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/application.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/license.lic	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 docs/WCS²¿ÊðÊÖ²á.md

@@ -154,7 +154,7 @@

# === License éç½® ===
license:
  subject: crnWcsDev
  subject: jsxswcs1
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 pom.xml

@@ -40,7 +40,9 @@
        <dependency>
            <groupId>cn.cool</groupId>
            <artifactId>framework</artifactId>
            <version>${cool.version}</version>
            <version>3.4.0</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/version/lib/framework-3.4.0.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>

 src/main/java/com/zy/core/enums/CrnTaskModeType.java

@@ -6,12 +6,11 @@
    PAKIN(1),    // å¥åº
    PAKOUT(2),    // åºåº
    LOC_MOVE(3),    // åºä½ç§»è½¬
    X_MOVE(4),    // ç«ä½ç§»è½¬
    Y_MOVE(5),    // ç«ä½ç§»è½¬
    XY_MOVE(6),    // ç«ä½ç§»è½¬
    CRN_MOVE(7),    // å åæºç§»å¨XYZ
    CRN_MOVE(4),    // å åæºç§»å¨XYZ
    BACK_ORIGIN(8),      // åååç¹
    CLEAR(9),       // æ¸é
    RESET(5),       // å¾©ä½
    ;

    public Integer id;

 src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java

@@ -112,7 +112,9 @@
                        Thread.sleep(500);
                    }else {
                        commandResult = true;
                        break;
                    }
                    writeAck++;
                }
            } while (writeAck < 5);

@@ -160,7 +162,7 @@
                Thread.sleep(500);
            } while (idx < 5);

            OperateResult confirmResult = siemensNet.Write("DB100.0", (short) 1);
            OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
            if (!confirmResult.IsSuccess) {
                News.error("å åæºåå¥ç¡®è®¤æ°æ®å¤±è´¥ ===>> [id:{}]", command.getCrnNo());
                response.setMessage("å åæºåå¥ç¡®è®¤æ°æ®å¤±è´¥");

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -275,6 +275,9 @@
        crnCommand.setTaskNo(taskNo); // å·¥ä½å·
        crnCommand.setAckFinish(0);  // ä»»å¡å®æç¡®è®¤ä½
        crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id); // ä»»å¡æ¨¡å¼:  å åæºç§»å¨
        crnCommand.setSourcePosX(Utils.getRow(targetLocNo));     // ç®æ åºä½æ
        crnCommand.setSourcePosY(Utils.getBay(targetLocNo));     // ç®æ åºä½å
        crnCommand.setSourcePosZ(Utils.getLev(targetLocNo));     // ç®æ åºä½å±
        crnCommand.setDestinationPosX(Utils.getRow(targetLocNo));     // ç®æ åºä½æ
        crnCommand.setDestinationPosY(Utils.getBay(targetLocNo));     // ç®æ åºä½å
        crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo));     // ç®æ åºä½å±

 src/main/resources/application.yml

@@ -19,7 +19,7 @@
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
    password: zy@123
  mvc:
    static-path-pattern: /**
  redis:
@@ -61,7 +61,7 @@

#Licenseç¸å³éç½®
license:
  subject: crnWcsDev
  subject: jsxswcs1
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 src/main/resources/license.lic

Binary files differ

			@@ -154,7 +154,7 @@

			# === License éç½® ===
			license:
			subject: crnWcsDev
			subject: jsxswcs1
			publicAlias: publicCert
			storePass: public_zhongyang_123456789
			licensePath: license.lic

			@@ -40,7 +40,9 @@
			<dependency>
			<groupId>cn.cool</groupId>
			<artifactId>framework</artifactId>
			<version>${cool.version}</version>
			<version>3.4.0</version>
			<scope>system</scope>
			<systemPath>${project.basedir}/version/lib/framework-3.4.0.jar</systemPath>
			</dependency>
			<dependency>
			<groupId>mysql</groupId>

			@@ -6,12 +6,11 @@
			PAKIN(1), // å¥åº
			PAKOUT(2), // åºåº
			LOC_MOVE(3), // åºä½ç§»è½¬
			X_MOVE(4), // ç«ä½ç§»è½¬
			Y_MOVE(5), // ç«ä½ç§»è½¬
			XY_MOVE(6), // ç«ä½ç§»è½¬
			CRN_MOVE(7), // å åæºç§»å¨XYZ
			CRN_MOVE(4), // å åæºç§»å¨XYZ
			BACK_ORIGIN(8), // åååç¹
			CLEAR(9), // æ¸é
			RESET(5), // å¾©ä½
			;

			public Integer id;

			@@ -112,7 +112,9 @@
			Thread.sleep(500);
			}else {
			commandResult = true;
			break;
			}
			writeAck++;
			}
			} while (writeAck < 5);

			@@ -160,7 +162,7 @@
			Thread.sleep(500);
			} while (idx < 5);

			OperateResult confirmResult = siemensNet.Write("DB100.0", (short) 1);
			OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
			if (!confirmResult.IsSuccess) {
			News.error("å åæºåå¥ç¡®è®¤æ°æ®å¤±è´¥ ===>> [id:{}]", command.getCrnNo());
			response.setMessage("å åæºåå¥ç¡®è®¤æ°æ®å¤±è´¥");

			@@ -275,6 +275,9 @@
			crnCommand.setTaskNo(taskNo); // å·¥ä½å·
			crnCommand.setAckFinish(0); // ä»»å¡å®æç¡®è®¤ä½
			crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id); // ä»»å¡æ¨¡å¼: å åæºç§»å¨
			crnCommand.setSourcePosX(Utils.getRow(targetLocNo)); // ç®æ åºä½æ
			crnCommand.setSourcePosY(Utils.getBay(targetLocNo)); // ç®æ åºä½å
			crnCommand.setSourcePosZ(Utils.getLev(targetLocNo)); // ç®æ åºä½å±
			crnCommand.setDestinationPosX(Utils.getRow(targetLocNo)); // ç®æ åºä½æ
			crnCommand.setDestinationPosY(Utils.getBay(targetLocNo)); // ç®æ åºä½å
			crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo)); // ç®æ åºä½å±

			@@ -19,7 +19,7 @@
			driver-class-name: com.mysql.jdbc.Driver
			url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
			username: root
			password: root
			password: zy@123
			mvc:
			static-path-pattern: /**
			redis:
			@@ -61,7 +61,7 @@

			#Licenseç¸å³éç½®
			license:
			subject: crnWcsDev
			subject: jsxswcs1
			publicAlias: publicCert
			storePass: public_zhongyang_123456789
			licensePath: license.lic