zy-wcs.git - Gitblit

			@@ -102,58 +102,17 @@
			for (DevpSlave.Sta inSta : devp.getInSta()) {
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			BarcodeThread barcodeThread1 = null;
			BarcodeThread barcodeThread2 = null;
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			String barcode1 = "";
			String barcode2 = "";

			//101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
			if((inSta.getStaNo().equals(101) \|\| inSta.getStaNo().equals(104))){
			barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
			if (barcodeThread1 != null) {
			barcode1 = barcodeThread1.getBarcode();
			}

			barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
			if (barcodeThread2 != null) {
			barcode2 = barcodeThread2.getBarcode();

			}

			Integer len1=0 , len2=0, len3=0;
			if(barcode != null) {
			String b[]=barcode.split(";");
			barcode=b[b.length-1];
			len1 = barcode.length();
			}
			if(barcode1 != null) {
			String b[]=barcode1.split(";");
			barcode1=b[b.length-1];
			len2 = barcode1.length();
			}
			if(barcode2 != null) {
			String b[]=barcode2.split(";");
			barcode2=b[b.length-1];
			len3 = barcode2.length();
			}

			if(len2 > len1 && len2 >= len3){
			barcode = barcode1;
			} else if (len3 > len1 && len3 >= len2){
			barcode = barcode2;
			}

			}
			//判断101和104是否是拣料、并板、盘点再入库
			WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
			if((inSta.getStaNo().equals(101) \|\| inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
			log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
			continue;
			}
			////判断101和104是否是拣料、并板、盘点再入库
			//WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
			//if((inSta.getStaNo().equals(101) \|\| inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
			// log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
			// continue;
			//}

			if (!Cools.isEmpty(barcode)) {
			log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			@@ -184,24 +143,6 @@
			continue;
			}
			if (inSta.getStaNo() == 104 && devpThread.ioModeOf1F2 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F3 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F4 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F1 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F2 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 == IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 == IoModeType.PAKOUT_MODE) {
			continue;
			}

			@@ -264,12 +205,6 @@
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			barcodeThread.setBarcode("");
			if(barcodeThread1 !=null){
			barcodeThread1.setBarcode("");
			}
			if(barcodeThread2 !=null){
			barcodeThread2.setBarcode("");
			}
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			@@ -411,24 +346,6 @@
			if (inSta.getStaNo() == 101 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}

			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			@@ -482,27 +399,9 @@
			String barcode = barcodeThread.getBarcode();


			//101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
			if((pickSta.getStaNo().equals(101) \|\| pickSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) \|\| Cools.isEmpty(barcode) )){
			BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode1());
			if (barcodeThread1 != null) {
			barcode = barcodeThread1.getBarcode();
			}

			if("NoRead".equals(barcode) \|\| Cools.isEmpty(barcode)) {
			BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode2());
			if (barcodeThread2 != null) {
			barcode = barcodeThread2.getBarcode();

			}
			}
			}

			if (!Cools.isEmpty(barcode)) {
			log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			// if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			// continue;
			// }
			} else {
			continue;
			}
			@@ -575,24 +474,6 @@
			break;
			case 103:
			sourceStaNo = 104;
			break;
			case 110:
			sourceStaNo = 111;
			break;
			case 113:
			sourceStaNo = 114;
			break;
			case 200:
			sourceStaNo = 201;
			break;
			case 203:
			sourceStaNo = 204;
			break;
			case 300:
			sourceStaNo = 301;
			break;
			case 303:
			sourceStaNo = 304;
			break;
			}

			@@ -986,24 +867,6 @@
			continue;
			}
			if (wrkMast.getStaNo() == 103 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 110 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 113 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 200 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 203 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 300 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
			continue;
			}
			if (wrkMast.getStaNo() == 303 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
			continue;
			}

			@@ -2178,24 +2041,6 @@
			case 104:
			staNo = 106;
			break;
			case 111:
			staNo = 112;
			break;
			case 114:
			staNo = 116;
			break;
			case 201:
			staNo = 202;
			break;
			case 204:
			staNo = 205;
			break;
			case 301:
			staNo = 302;
			break;
			case 304:
			staNo = 305;
			break;
			}
			WrkMast pakout = wrkMastMapper.selectWorkingPakout(staNo);
			switch (inSta.getStaNo()) {
			@@ -2233,114 +2078,6 @@
			} else {
			// 入库模式
			devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
			}
			break;
			case 111: // 1F3
			if (pakout != null) {
			if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf1F3 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
			}
			break;
			case 114: // 1F4
			if (pakout != null) {
			if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf1F4 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
			}
			break;
			case 201: // 2F1
			if (pakout != null) {
			if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf2F1 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
			}
			break;
			case 204: // 2F2
			if (pakout != null) {
			if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf2F2 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf2F2 = IoModeType.PAKIN_MODE;
			}
			break;
			case 301: // 3F1
			if (pakout != null) {
			if (devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf3F1 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf3F1 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
			}
			break;
			case 304: // 3F2
			if (pakout != null) {
			if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
			// 出库切换中
			devpThread.ioModeOf3F2 = IoModeType.PAKOUT_BOOTING;
			WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
			if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
			&& !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
			&& devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
			// 出库模式
			devpThread.ioModeOf3F2 = IoModeType.PAKOUT_MODE;
			}
			}
			} else {
			// 入库模式
			devpThread.ioModeOf3F2 = IoModeType.PAKIN_MODE;
			}
			break;
			}