YiWuProject.git

			@@ -1,6 +1,6 @@
			package com.mes.s7.entity;

			import com.github.xingshuangs.iot.protocol.common.enums.EDataType;
			import com.github.xingshuangs.iot.common.enums.EDataType;
			import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
			import lombok.Data;

			@@ -13,32 +13,32 @@
			public class S7DataSP {


			@S7Variable(address = "DB19.14", type = EDataType.INT16)
			private Short taskState;
			@S7Variable(address = "DB19.14", type = EDataType.UINT16)
			private Integer taskState;

			@S7Variable(address = "DB19.18", type = EDataType.INT16)
			private Short damageCount;
			@S7Variable(address = "DB19.18", type = EDataType.UINT16)
			private Integer damageCount;

			@S7Variable(address = "DB19.20", type = EDataType.INT16)
			private Short rawGlassWidth;
			@S7Variable(address = "DB19.20", type = EDataType.UINT16)
			private Integer rawGlassWidth;

			@S7Variable(address = "DB19.22", type = EDataType.INT16)
			private Short rawGlassHeight;
			@S7Variable(address = "DB19.22", type = EDataType.UINT16)
			private Integer rawGlassHeight;

			@S7Variable(address = "DB19.24", type = EDataType.INT16)
			private Short slot;
			@S7Variable(address = "DB19.24", type = EDataType.UINT16)
			private Integer slot;

			@S7Variable(address = "DB19.26", type = EDataType.INT16)
			private Short totalCount;
			@S7Variable(address = "DB19.26", type = EDataType.UINT16)
			private Integer totalCount;

			@S7Variable(address = "DB19.28", type = EDataType.INT16)
			private Short finishCount;
			@S7Variable(address = "DB19.28", type = EDataType.UINT16)
			private Integer finishCount;

			@S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
			private Boolean taskRunning;

			@S7Variable(address = "DB19.30", type = EDataType.INT16)
			private Short inkageState;
			@S7Variable(address = "DB19.30", type = EDataType.UINT16)
			private Integer inkageState;


			}