YiWuProject.git

			@@ -58,8 +58,7 @@
			* @param data word的值
			*/
			public void WriteWord(String address, short data) {
			if (s7PLC==null)
			{
			if (s7PLC == null) {
			return;
			}
			s7PLC.writeInt16(address, data);
			@@ -89,10 +88,6 @@
			* @param address 地址
			* @param datas word的值
			*/






			/**
			@@ -142,6 +137,7 @@
			}
			s7PLC.writeMultiData(addressWrite);
			}

			/**
			* 按指定的地址写入多个byte
			*
			@@ -172,8 +168,6 @@
			return null;
			}
			}




			private int getIndexFromAddress(String address) {
			@@ -242,6 +236,7 @@
			return null;
			return s7PLC.readBoolean(addresslist);
			}

			//读取不连续地址bit
			public List<Boolean> readBits(List<String> addressList) {
			if (s7PLC == null \|\| addressList.isEmpty()) {
			@@ -286,9 +281,6 @@
			}





			public List<String> readStringsandword(List<String> addressList) {
			if (s7PLC == null) {
			return null;
			@@ -320,7 +312,6 @@
			}



			//不连续地址写入Word
			public void WriteWord(List<String> address, List<Short> datas) {
			if (s7PLC == null)
			@@ -337,7 +328,6 @@
			}
			}
			}



			//字符串写入
			@@ -400,9 +390,6 @@
			}





			private int extractAddressNumber(String address) {
			String numberStr = address.replaceAll("\\D+", ""); // 使用正则表达式提取数字部分
			return Integer.parseInt(numberStr);
			@@ -427,13 +414,14 @@
			return null;
			}

			};
			}

			;


			public void writeString(String addr,String data) {
			s7PLC.writeString(addr,data);
			}



			private List<String> GetAddressList(String address, int count, int addedbit) {