zy-wcs.git - Gitblit

			@@ -34,9 +34,7 @@
			import com.zy.core.model.protocol.StaProtocol;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.properties.SystemProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.MelsecCrnThread;
			import com.zy.core.thread.ScaleThread;
			import com.zy.core.thread.*;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;
			@@ -269,7 +267,8 @@
			CrnDetailVo vo = new CrnDetailVo();
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			if (crnSlave.getId().equals(crnNo)) {
			MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
			SiemensCrnThread crnThread=(SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
			// MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			vo.setCrnNo(crnNo);
			vo.setWorkNo(crnProtocol.getTaskNo());

			@@ -42,9 +42,9 @@
			private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
			private short heartBeatVal = 1;
			public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
			add(101);add(102);add(103);add(104);
			add(201);add(202);add(203);add(204);
			add(301);add(302);add(303);add(304);add(305);add(306);
			add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
			// add(201);add(202);add(203);add(204);
			// add(301);add(302);add(303);add(304);add(305);add(306);
			}};

			/**
			@@ -157,7 +157,7 @@
			Thread.sleep(200);
			OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2));
			if (result1.IsSuccess) {
			for (int i = 0; i < staNoSize; i++) {
			for (int i = 0; i < staNoSize-1; i++) {
			Integer siteId = staNos.get(i); // 站点编号
			boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
			StaProtocol staProtocol = station.get(siteId);

			@@ -1,5 +1,5 @@
			server:
			port: 9090
			port: 8081
			servlet:
			context-path: /@pom.build.finalName@

			@@ -34,7 +34,7 @@
			enable: false

			wms:
			url: localhost:8081/ynwms
			url: localhost:8080/ynwms

			# 下位机配置
			wcs-slave:
			@@ -47,7 +47,7 @@
			# 堆垛机1
			crn[0]:
			id: 1
			ip: 10.10.10.10
			ip: 172.28.15.210
			port: 8888
			rack: 0
			slot: 0
			@@ -90,7 +90,7 @@
			# 输送线
			devp[0]:
			id: 1
			ip: 192.168.4.250
			ip: 172.28.15.220
			port: 102
			rack: 0
			slot: 0

	src/main/java/com/zy/asrs/controller/ConsoleController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/core/thread/SiemensDevpThread.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/application.yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史