zy-wcs.git - Gitblit

			@@ -48,9 +48,9 @@
			// 方法1: 使用绝对路径直接加载DLL
			try {
			// 使用真实路径加载DLL
			String projectBaseDir = "D:\\work\\work-zy\\zy-wcs";
			String mainDllPath = projectBaseDir + "\\src\\main\\resources\\lib\\" + mainDllName;
			String depDllPath = projectBaseDir + "\\src\\main\\resources\\lib\\" + depDllName;
			String projectBaseDir = "D:\\apache-tomcat-8.5.57\\webapps";
			String mainDllPath = projectBaseDir + "\\wcs\\WEB-INF\\classes\\lib\\" + mainDllName;
			String depDllPath = projectBaseDir + "\\wcs\\WEB-INF\\classes\\lib\\" + depDllName;

			File mainDllFile = new File(mainDllPath);
			File depDllFile = new File(depDllPath);

			@@ -1115,12 +1115,17 @@
			// ledThread.errorReset();
			}
			} else {
			String errorMsg = jsonObject.getString("msg");
			// 如果任务回退，并且站点不是自动状态，则不触发回退
			if (!staProtocol.isAutoing()) {
			log.error("空板入库回退"+wrkNo+","+errorMsg+"，站点不是自动状态，不触发回退");
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			wrkNo++;
			staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			String errorMsg = jsonObject.getString("msg");
			log.error("空板入库回退"+wrkNo+","+errorMsg);
			if (!result) {
			News.errorNoLog(""+mark+" - 2"+" - 更新plc站点信息失败");

	src/main/java/com/rfid/uhf288/Device.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/service/impl/MainServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史