zy-wcs.git - Gitblit

			@@ -404,13 +404,13 @@
			if (basCrnp.getInEnable().equals("Y")) {
			// 入库
			if (this.crnStnToLoc(crn, crnProtocol)) {
			crnProtocol.setLastIo("O");
			}
			crnProtocol.setLastIo("O");
			} else if (basCrnp.getOutEnable().equals("Y")) {
			// 出库
			if (this.locToCrnStn(crn, crnProtocol)) {
			crnProtocol.setLastIo("I");
			}
			crnProtocol.setLastIo("I");
			}
			}
			// 如果最近一次是出库模式
			@@ -418,15 +418,17 @@
			if (basCrnp.getOutEnable().equals("Y")) {
			// 出库
			if (this.locToCrnStn(crn, crnProtocol)) {
			crnProtocol.setLastIo("I");
			}
			crnProtocol.setLastIo("I");
			} else if (basCrnp.getInEnable().equals("Y")) {
			// 入库
			if (this.crnStnToLoc(crn, crnProtocol)) {
			crnProtocol.setLastIo("O");
			}
			crnProtocol.setLastIo("O");
			}
			}
			// 库位移转
			this.locToLoc(crn, crnProtocol);
			}
			}
			}
			@@ -451,18 +453,20 @@
			log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
			&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			flag = true;
			}
			if (!flag) {
			continue;
			}
			// 获取工作状态为 2,3,4,5,6 的入库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep23456(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
			if(null == wrkMast) {
			log.error("{}站点查询无待入库数据工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
			// log.error("{}站点查询无待入库数据工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
			continue;
			}
			if (wrkMast.getWrkSts() < 3) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
			&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			flag = true;
			}
			if (!flag) {
			continue;
			}
			}
			// 获取库位信息
			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			@@ -483,7 +487,7 @@
			if (steNo != null) {
			// 小车行走到堆垛机待搬移点
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			this.letCarBeReady(wrkMast, steNo);
			this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
			}
			// 小车搬走
			if (wrkMast.getWrkSts() == 3L) {
			@@ -539,7 +543,7 @@
			if (steNo != null) {
			// 小车行走到堆垛机待搬移点
			if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
			this.letCarBeReady(wrkMast, steNo);
			this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
			}
			// 堆垛机将货放至小车上 3.小车待搬（小车不用搬运，已经在当前组库位） / 6.小车待入 ===>> 7.吊车入库中
			if (wrkMast.getWrkSts() == 3L \|\| wrkMast.getWrkSts() == 6L) {
			@@ -587,7 +591,7 @@
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId());
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getLocNo());
			}
			}
			// 堆垛机搬运小车
			@@ -607,7 +611,7 @@
			public boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
			if (wrkMast == null) {
			continue;
			}
			@@ -681,7 +685,7 @@
			// 不是最外层库位，需要使用穿梭车搬运后，再堆垛机出库
			} else {
			// 当前组库位是否有穿梭车
			Integer steNo = this.hasCarOfIdle(wrkMast.getLocNo());
			Integer steNo = this.hasCarOfIdle(wrkMast.getSourceLocNo());
			// 有小车
			if (steNo != null) {
			if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
			@@ -696,12 +700,12 @@
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.TO_B); // 任务模式: 去近点等待堆垛机叉取
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 去近点等待堆垛机叉取

			SteABType ab = Utils.selectAB(steProtocol.getRow().intValue());
			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());


			// todo:luxiaotao
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			@@ -729,7 +733,7 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 源库位排
			crnCommand.setSourcePosX(Utils.getGroupRow(sourceSta.getRow1()).shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			@@ -757,7 +761,7 @@
			SteThread steThread = queryIdleCar(wrkMast);
			if (steThread != null) {
			// 让小车等待搬运待续
			this.letCarBeReady(wrkMast, steThread.getSlave().getId());
			this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
			}
			}
			// 堆垛机搬运小车
			@@ -770,6 +774,99 @@
			}
			}
			return false;
			}

			/**
			* 库位移转
			*/
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			// 获取工作档信息
			WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
			if (null == wrkMast) {
			return;
			}
			// 获取源库位信息
			LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
			if (null == sourceSta) {
			log.error("工作档库位移转失败，原因：检索源库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
			return;
			}
			// 源库位库位状态判断
			if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("S")) {
			return;
			}
			// 获取目标库位信息
			LocMast sta = locMastService.selectById(wrkMast.getLocNo());
			if (null == sta) {
			log.error("工作档库位移转失败，原因：检索目标库位失败！工作号={}，源库位={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
			return;
			}
			// 获取堆垛机信息并判断是否可入出
			BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
			if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) {
			return;
			}

			// 堆垛机控制过滤
			if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() != 0) {
			return;
			}

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			return;
			}



			// 源库位 ===>> 最外层库位
			if (locMastService.isOutMost(wrkMast.getSourceLocNo())) {
			// 目标库位 ===>> 最外层库位
			if (locMastService.isOutMost(wrkMast.getLocNo())) {
			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			// 修改工作档状态 11.生成出库ID => 16.吊车出库中
			Date now = new Date();
			wrkMast.setWrkSts(16L);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("【库位移转】修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			} else {



			}

			} else {

			}











			}

			/**
			@@ -808,10 +905,10 @@
			}

			/**
			* 让小车从远点 ====>> 移动到近点
			* 让小车从远点 ====>> 待机
			* 等待堆垛机搬运
			*/
			public void letCarBeReady(WrkMast wrkMast, Integer steNo) {
			public void letCarBeWaiting(WrkMast wrkMast, Integer steNo, String locNo) {
			// 获取穿梭车信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			@@ -822,7 +919,41 @@
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.TO_B); // 任务模式: 去近点等待堆垛机叉取
			steCommand.setTaskMode(SteTaskModeType.findWaiting(steProtocol.getRow().intValue())); // 任务模式: 去近点等待堆垛机叉取

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkMast.setSteNo(steNo);
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			}
			}

			/**
			* 让小车从远点 ====>> 移动到近点
			* 等待堆垛机搬运
			*/
			public void letCarBeReady(WrkMast wrkMast, Integer steNo, String locNo) {
			// 获取穿梭车信息
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { return; }
			if (steProtocol.isIdle()) {

			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 任务模式: 去近点等待堆垛机叉取

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			steCommand.setBay(steProtocol.getBay());
			@@ -861,7 +992,7 @@
			crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(steProtocol.getRow()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			@@ -890,7 +1021,7 @@
			crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(steProtocol.getRow()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			@@ -1014,8 +1145,7 @@
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.TO_B); // 任务模式: 去近点等待堆垛机叉取
			// todo:luxiaotao
			steCommand.setTaskMode(SteTaskModeType.findInByLoc(wrkMast.getLocNo())); // 任务模式: 搬入库
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			@@ -1049,6 +1179,18 @@
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 穿梭车去待机位
			BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkMast.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(9999); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 任务模式: 去近点等待堆垛机叉取
			// steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			// steCommand.setBay(steProtocol.getBay());
			// steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			}
			} else {
			log.error("修改工作档状态 4.迁入小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			}
			@@ -1068,6 +1210,18 @@
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 穿梭车去待机位
			BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkMast.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(9999); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 任务模式: 去近点等待堆垛机叉取
			// steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			// steCommand.setBay(steProtocol.getBay());
			// steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车待机位命令下发失败，穿梭车号={}，任务数据={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
			}
			} else {
			log.error("修改工作档状态 5.迁出小车 => 6.小车待入失败！！，工作号={}", wrkMast.getWrkNo());
			}
			@@ -1078,34 +1232,33 @@
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.isIdle()) {
			// if (steProtocol.isIdle()) {
			// 穿梭车重新定位排列层
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.TO_B); // 任务模式: 去近点等待堆垛机叉取
			// todo:luxiaotao
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			if (!steThread.confirmPos()) {
			log.error("{}号穿梭车重新定位失败！作业工作档任务号：{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
			}
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkMast.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 任务模式: 搬出库
			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 13.迁入小车 ==> 14.小车搬出库
			wrkMast.setWrkSts(14L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			// 13.迁入小车 ==> 14.小车搬出库
			wrkMast.setWrkSts(14L);
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			} else {
			log.error("修改工作档状态 13.迁入小车 ==> 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			log.error("修改工作档状态 13.迁入小车 ==> 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			}
			// }
			}
			}
			}
			@@ -1122,54 +1275,56 @@
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0) {
			// 查询是否有待入库的任务
			WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo());
			if (wrkMast == null) { continue; }
			if (steProtocol.getTaskNo() == 9999) {
			steThread.setResetFlag(true);
			} else {
			// 查询是否有待入库的任务
			WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo().intValue());
			if (wrkMast == null) { continue; }

			switch (wrkMast.getWrkSts().intValue()) {
			case 2:
			// 修改工作档状态 2.设备上走 => 3.小车待搬
			wrkMast.setWrkSts(3L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 2.设备上走 => 3.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 8:
			// 修改工作档状态 8.小车搬入库 => 9.入库完成
			wrkMast.setWrkSts(9L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 8.小车搬入库 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 11:
			// 修改工作档状态 11.生成出库ID => 12.小车待搬
			wrkMast.setWrkSts(12L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 14:
			// 修改工作档状态 14.小车搬出库 => 15.等待吊车
			wrkMast.setWrkSts(15L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 14.小车搬出库 => 15.等待吊车失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			switch (wrkMast.getWrkSts().intValue()) {
			case 2:
			// 修改工作档状态 2.设备上走 => 3.小车待搬
			wrkMast.setWrkSts(3L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 2.设备上走 => 3.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 8:
			// 修改工作档状态 8.小车搬入库 => 9.入库完成
			wrkMast.setWrkSts(9L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 8.小车搬入库 => 9.入库完成失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 11:
			// 修改工作档状态 11.生成出库ID => 12.小车待搬
			wrkMast.setWrkSts(12L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.小车待搬失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			case 14:
			// 修改工作档状态 14.小车搬出库 => 15.等待吊车
			wrkMast.setWrkSts(15L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 14.小车搬出库 => 15.等待吊车失败！！，工作号={}", wrkMast.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			break;
			}
			}


			}
			}
			}
			@@ -1314,7 +1469,7 @@
			}
			// 站点条件判断
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9990 \|\| staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| (staProtocol.getWorkNo() >= 9990 && staProtocol.getWorkNo() <= 9999) \|\| staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {

			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			@@ -1485,9 +1640,5 @@
			}
			}
			}





			}