zy-wcs.git - Gitblit

			@@ -243,10 +243,10 @@
			}
			} else if (code == 1000){
			if (inSta.getStaNo().equals(103)){
			staProtocol.setWorkNo((short)9999);
			staProtocol.setWorkNo((short)9996);
			staProtocol.setStaNo((short)203);
			}else {
			staProtocol.setWorkNo((short)9999);
			staProtocol.setWorkNo((short)9996);
			staProtocol.setStaNo((short)103);
			}
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			@@ -1263,6 +1263,17 @@
			continue;
			}

			/*
			* 100、200存在进行中的盘点任务，则不执行盘点任务
			* */
			if (wrkMast.getIoType().equals(107)){
			Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
			if (countPan > 1){
			News.error("MainServiceImpl locToCrnStn 1271行"+"盘点出库跳过，存在进行中可能堵塞任务数{}个",countPan);
			continue;
			}
			}

			// 获取堆垛机出库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			@@ -1369,11 +1380,11 @@
			}else {
			waitWrkMast.setIoPri(9999d);
			}
			if (wrkMast.getIoPri()>20.0){
			wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
			}else {
			wrkMast.setIoPri(13.0d);
			}
			// if (wrkMast.getIoPri()>23.0){
			// wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
			// }else {
			wrkMast.setIoPri(15.0d);
			// }
			if (wrkMastMapper.updateById(wrkMast)==0){
			News.error("调整优先级失败");
			}
			@@ -4395,6 +4406,75 @@
			break;
			}
			LocMast loc = null;

			if(shallowLoc.getLocType2() == 3){ //低频混直接出库
			// 获取工作号
			int workNo = commonService.getWorkNo(0);
			Date now = new Date();
			// 保存工作档
			WrkMast wrkMast = new WrkMast();
			wrkMast.setWrkNo(workNo);
			wrkMast.setIoTime(now);
			wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
			wrkMast.setIoType(101); // 入出库状态： 101.全板出库
			wrkMast.setIoPri((double) 9999);
			wrkMast.setCrnNo(crn.getId());
			wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位
			if (shallowLoc.getCrnNo()==1){
			wrkMast.setStaNo(100);
			wrkMast.setSourceStaNo(108);
			}else if (shallowLoc.getCrnNo()==2){
			wrkMast.setStaNo(100);
			wrkMast.setSourceStaNo(104);
			}else {
			wrkMast.setStaNo(200);
			wrkMast.setSourceStaNo(208);
			}


			// wrkMast.setLocNo(loc.getLocNo()); // 目标库位
			wrkMast.setFullPlt("Y"); // 满板
			wrkMast.setPicking("N"); // 拣料
			wrkMast.setExitMk("N"); // 退出
			wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 空板
			wrkMast.setBarcode(shallowLoc.getBarcode()); // 托盘码
			wrkMast.setLinkMis("N");
			wrkMast.setAppeTime(now);
			wrkMast.setModiTime(now);
			int res = wrkMastMapper.insert(wrkMast);
			if (res == 0) {
			throw new CoolException("保存工作档失败");
			}
			// 工作档明细保存
			if (shallowLoc.getLocSts().equals("F")) {
			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
			for (LocDetl locDetl : locDetls) {
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.sync(locDetl);
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(new Date());
			wrkDetl.setAnfme(locDetl.getAnfme());
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			if (!wrkDetlService.insert(wrkDetl)) {
			throw new CoolException("保存工作档明细失败");
			}
			}
			}
			// 修改源库位状态
			if (shallowLoc.getLocSts().equals("D") \|\| shallowLoc.getLocSts().equals("F")) {
			shallowLoc.setLocSts("R"); // R.出库预约
			shallowLoc.setModiTime(now);
			if (!locMastService.updateById(shallowLoc)) {
			throw new CoolException("更新源库位状态失败");
			}
			} else {
			throw new CoolException("源库位出库失败");
			}

			return;
			}

			List<LocMast> locs = locMastService.selectList(new EntityWrapper<LocMast>().eq("crn_no",crn.getId())
			.eq("loc_type1",shallowLoc.getLocType1())
			.eq("loc_type2",shallowLoc.getLocType2())
			@@ -4430,7 +4510,7 @@

			if (null == loc) {
			News.error("深库位出库 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			// return;
			return;
			// throw new CoolException("深库位出库 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			}

			@@ -4561,4 +4641,51 @@
			}
			}

			public synchronized void automaticallyTurnOffCharging() {
			// 获取当前时间戳
			long timestamp = System.currentTimeMillis();
			Date date = new Date(timestamp);
			TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
			java.util.Calendar calendar = java.util.Calendar.getInstance(timeZone);
			calendar.setTime(date);
			int hour = calendar.get(java.util.Calendar.HOUR_OF_DAY);
			if (hour>8 && hour<18){
			for (SteSlave ste : slaveProperties.getSte()) {
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
			SteProtocol steProtocol = steThread.getSteProtocol();
			BasSte basSte = basSteService.selectById(ste.getId());
			if (Cools.isEmpty(steProtocol, basSte)) { continue; }
			try{
			// 在线空闲无作业标记不在充电
			if (steProtocol.getMode() == 0
			\|\| !steProtocol.statusType.equals(SteStatusType.IDLE)
			\|\| basSte.getPakMk().equals("Y")
			\|\| steProtocol.getChargeStatus() == 0
			) {
			continue;
			}
			if (!steProtocol.isEnable()) {
			continue;
			}
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
			WrkCharge wrkCharge = wrkChargeService.selectWorking(steProtocol.getSteNo().intValue());
			if (wrkCharge == null) {
			if (steProtocol.getChargeStatus() == 1){
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(ste.getId()); // 穿梭车编号
			steCommand.setTaskNo(9999); // 工作号
			steCommand.setTaskMode(SteTaskModeType.CLOSE_CHARGE);
			if (!MessageQueue.offer(SlaveType.Ste, ste.getId(), new Task(2, steCommand))) {
			News.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", ste.getId(), JSON.toJSON(steCommand));
			}
			}
			}
			}
			}catch (Exception e){
			News.error("自动关闭充电出错，联系管理员！"+hour+"点;"+ste.getId()+"号小车;");
			}
			}
			}
			}

			}