zy-wcs.git - Gitblit

			@@ -206,14 +206,14 @@

			Thread.sleep(200);
			//测试柜状态获取
			OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
			OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 48);
			//启动移库按钮
			OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
			//消防报警
			OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
			OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
			if(result3.IsSuccess) {
			for(int i=0; i<48; i++){
			startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//测试柜状态
			startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//测试柜状态
			startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//消防状态
			startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//启动按钮状态
			}
			@@ -288,11 +288,17 @@
			boolean idFlag = false;
			OperateResult write;
			while(idCount < 5){

			write = siemensS7Net.Write("DB100." + index*4, array); // 写
			if(write.IsSuccess){
			Thread.sleep(200);
			OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
			if(readId.IsSuccess){
			OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index4, (short) (staNoSize2));
			if(readId.IsSuccess){
			if(staProtocol.getWorkNo()!=0&&staProtocol.getWorkNo()!=9999){
			if(!staProtocol.isInEnable()&&(staProtocol.getSiteId()==201\|\|staProtocol.getSiteId()==206)){
			break;
			}
			}
			short workNo = siemensS7Net.getByteTransform().TransInt16(readId.Content, 0);
			if(staProtocol.getWorkNo().equals(workNo)){
			//工作号写入成功

			@@ -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=zjfnasrs
			url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs

			username: sa
			password: sa@123
			@@ -35,7 +35,7 @@
			enable: false

			wms:
			url: localhost:8081/fnwms
			url: localhost:8080/fnwms

			# 下位机配置
			wcs-slave:

			@@ -108,7 +108,7 @@
			</select>

			<select id="selectLocMove" resultMap="BaseResultMap">
			select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
			select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc,io_time ASC,wrk_no ASC
			</select>

			<select id="selectLocMoving" resultMap="BaseResultMap">

			@@ -6,6 +6,7 @@
			<link rel="stylesheet" href="../static/css/index.css">
			<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
			<style>

			</style>
			</head>
			<body>

			@@ -7,12 +7,11 @@
			<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
			<style>
			html{
			transform: scale(1) translate(0,0);
			/transform: scale(0.5) translate(-50%,-50%);/
			height: 150%;
			width: 150%;
			/transform: scale(1) translate(0,0);/
			transform: scale(0.5) translate(-50%,-50%);
			height: 200%;
			width: 200%;
			}

			</style>
			</head>
			<body>

	src/main/java/com/zy/core/thread/SiemensDevpThread.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/application.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/WrkMastMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/indexTV.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史