zy-wcs.git - Gitblit

			@@ -62,7 +62,6 @@
			*/
			@Slf4j
			@Service("mainService")
			@Transactional
			public class MainServiceImpl {

			public static final long COMMAND_TIMEOUT = 5 * 1000;
			@@ -234,6 +233,12 @@
			.eq("loc_no", dto.getLocNo()));

			short staNo = dto.getStaNo().shortValue();

			int sourceStaNo = dto.getSourceStaNo();
			if (sourceStaNo == 1007) {
			staNo = 2002;
			}

			if (inSta.getStaNo() == 1002) {
			staNo = 2002;
			}
			@@ -684,7 +689,7 @@
			staProtocol = staProtocol.clone();
			}

			if (staProtocol.isAutoing() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == null)) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == null)) {
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();

			@@ -742,6 +747,12 @@
			// if(crnThread.isBackHpFlag()){
			// continue;
			// }

			//堆垛机回原点任务中
			Object object = redisUtil.get(RedisConstantType.CRN_MOVE_LOCK);
			if (object != null) {
			continue;
			}

			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			@@ -842,7 +853,7 @@
			News.error("堆垛机移动命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
			}
			crnThread.setBackHpFlag(true);
			redisUtil.set(RedisConstantType.CRN_MOVE_LOCK + crn.getId(), "lock", 60);
			redisUtil.set(RedisConstantType.CRN_MOVE_LOCK + crn.getId(), "lock", 10);
			try {
			Thread.sleep(500);
			} catch (Exception e) {
			@@ -914,7 +925,7 @@
			News.error("堆垛机移动命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
			}
			crnThread.setBackHpFlag(true);
			redisUtil.set(RedisConstantType.CRN_MOVE_LOCK + crn.getId(), "lock", 60);
			redisUtil.set(RedisConstantType.CRN_MOVE_LOCK + crn.getId(), "lock", 10);
			try {
			Thread.sleep(500);
			} catch (Exception e) {
			@@ -1202,8 +1213,7 @@
			// continue;
			}
			// 判断堆垛机出库站状态
			if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
			&& staProtocol.getWorkNo() == 0) {
			if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {

			//根据参数判断是否校验可出信号
			String crnOutVerifyOut = "Y";
			@@ -1215,6 +1225,10 @@

			if (crnOutVerifyOut.equals("Y")) {
			if (!staProtocol.isOutEnable()) {
			continue;
			}

			if (staProtocol.getWorkNo() > 0) {
			continue;
			}
			}
			@@ -1229,12 +1243,22 @@
			}

			if (crnProtocol.getCrnNo() == 1) {
			//判断堆垛机和当前任务是否处于一个巷道
			if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
			//判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
			List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
			if (!currentWrkMasts.isEmpty()) {
			continue;//当前堆垛机所在巷道存在任务
			String turnCrnExecuteCurrentChannel = "Y";
			Config turnCrnExecuteCurrentChannelConfig = configService.selectOne(new EntityWrapper<Config>()
			.eq("code", "turnCrnExecuteCurrentChannel")
			);
			if (turnCrnExecuteCurrentChannelConfig != null) {
			turnCrnExecuteCurrentChannel = turnCrnExecuteCurrentChannelConfig.getValue();
			}

			if(turnCrnExecuteCurrentChannel.equals("Y")) {
			//判断堆垛机和当前任务是否处于一个巷道
			if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
			//判断堆垛机所在巷道是否存在其他任务，如存在则优先执行
			List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
			if (!currentWrkMasts.isEmpty()) {
			continue;//当前堆垛机所在巷道存在任务
			}
			}
			}
			}
			@@ -1520,6 +1544,7 @@
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.error("" + mark + " - 3" + " - 5" + " - 【库位移转】修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", wrkMast.getWrkNo());
			}
			crnProtocol.setLastIo("I");
			}
			News.infoNoLog("" + mark + " - 3" + " - 0" + " - 堆垛机入出库作业下发：库位移转完成");

			@@ -1653,7 +1678,10 @@
			crnThread.setResetFlag(true);
			}
			}else {
			if (wrkMast.getWrkSts() != 14 \|\| wrkMast.getWrkSts() != 15) {
			List<Long> list = new ArrayList<>();
			list.add(14L);
			list.add(15L);
			if (!list.contains(wrkMast.getWrkSts())) {
			News.error("" + mark + " - 1" + " - 堆垛机处于等待确认但工作档状态未完成。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
			continue;
			}
			@@ -1877,9 +1905,13 @@
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_no", dto.getLocNo()));

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			staProtocol.setPalletSize(locMast.getLocType2());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			@@ -1987,7 +2019,7 @@
			wrkMast1.setIoType(3); // 入出库状态：3.站到站
			wrkMast1.setIoPri(13D); // 优先级
			wrkMast1.setSourceStaNo(emptyInSta.getStaNo());
			wrkMast1.setStaNo(1007);
			wrkMast1.setStaNo(1004);
			wrkMast1.setBarcode(barcode);
			// 操作人员数据
			wrkMast1.setAppeTime(new Date());
			@@ -2000,6 +2032,7 @@
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo((short) workNo);
			staProtocol.setStaNo((short) 2003);
			staProtocol.setPalletSize((short) 1);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			@@ -2106,22 +2139,55 @@
			// }catch (Exception e){
			// log.error("工作档案明细输入电视机失败1：异常信息==》"+e);
			// }
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
			wrkDetl.getMatnr()
			, wrkDetl.getMaktx()
			, wrkDetl.getAnfme()
			, wrkDetl.getWeight()
			, wrkDetl.getStockNum()
			, wrkDetl.getStockNum2()
			, wrkDetl.getSpecs()
			, wrkDetl.getSku()
			, wrkDetl.getZpallet()
			, wrkDetl.getModel()
			, wrkDetl.getSupp()
			, wrkDetl.getKpCstmrName()
			, wrkDetl.getOrderNo()
			, wrkDetl.getCstateid$()
			)));

			if (!wrkDetls.isEmpty()) {
			WrkDetl wrkDetl = wrkDetls.get(0);
			for (WrkDetl detl : wrkDetls) {
			double anfme = wrkDetl.getAnfme() + detl.getAnfme();
			double weight = wrkDetl.getWeight() + detl.getWeight();
			double stockNum = wrkDetl.getStockNum() + detl.getStockNum();
			double stockNum2 = wrkDetl.getStockNum2() + detl.getStockNum2();
			wrkDetl.setAnfme(anfme);
			wrkDetl.setWeight(weight);
			wrkDetl.setStockNum(stockNum);
			wrkDetl.setStockNum2(stockNum2);
			}

			ledCommand.getMatDtos().add(new MatDto(
			wrkDetl.getMatnr()
			, wrkDetl.getMaktx()
			, wrkDetl.getAnfme()
			, wrkDetl.getWeight()
			, wrkDetl.getStockNum()
			, wrkDetl.getStockNum2()
			, wrkDetl.getSpecs()
			, wrkDetl.getSku()
			, wrkDetl.getZpallet()
			, wrkDetl.getModel()
			, wrkDetl.getSupp()
			, wrkDetl.getKpCstmrName()
			, wrkDetl.getOrderNo()
			, wrkDetl.getCstateid$()
			));

			// wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
			// wrkDetl.getMatnr()
			// , wrkDetl.getMaktx()
			// , wrkDetl.getAnfme()
			// , wrkDetl.getWeight()
			// , wrkDetl.getStockNum()
			// , wrkDetl.getStockNum2()
			// , wrkDetl.getSpecs()
			// , wrkDetl.getSku()
			// , wrkDetl.getZpallet()
			// , wrkDetl.getModel()
			// , wrkDetl.getSupp()
			// , wrkDetl.getKpCstmrName()
			// , wrkDetl.getOrderNo()
			// , wrkDetl.getCstateid$()
			// )));
			}

			}
			commands.add(ledCommand);
			}