Jcdm042-Mes-Module-One.git

			@@ -130,13 +130,13 @@
			String cellCode = value1.toString();
			scanResult = 11;
			//反馈电芯ocv检测结果,这里不用再进行检测，只要码没问题就可以了
			/*boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验
			boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验
			//四个电芯的状态
			if (b){
			scanResult = 11;
			}else {
			scanResult = 12;
			}*/
			}
			}else {
			scanResult = 12;
			}
			@@ -181,7 +181,7 @@
			if (ObjectUtil.isNotNull(productTypeObjcet)){
			String productType = productTypeObjcet.toString();//产品类型
			String materialCode = Constants.materialMap.get(productType);
			//调用工厂MES，保存到数据库,并且将工单传给PLC
			//接收工单，保存到数据库,并且将工单传给PLC
			CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
			receivingWorkOrders(thoroughfare, device,materialCode);
			});
			@@ -326,7 +326,7 @@
			OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
			omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
			omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
			omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
			omProductionOrdeInfo.setStationCode(device);
			omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
			omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
			omProductionOrdeInfo.setOnlineCompletionMark("0");
			@@ -830,36 +830,6 @@
			}

			/**
			* 030工位返回ocv测试结果
			* @param thoroughfare
			* @param device
			* @param cellCode
			* @throws Exception
			*/
			private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
			boolean flag = true;

			List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
			.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
			.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
			.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
			);
			if (CollUtil.isNotEmpty(list)){
			DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
			if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
			flag = true;
			}else {
			flag = false;
			}
			daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
			}else {
			flag = false;
			log.info("读取到工位{},测试设备返回的数据查询不到，电芯码为：{}",device,cellCode);
			}
			return flag;
			}

			/**
			* OP020校验电芯挡位
			* @param thoroughfare
			* @param device
			@@ -898,6 +868,34 @@
			* 030工位返回ocv测试结果
			* @param thoroughfare
			* @param device
			* @param cellCode
			* @throws Exception
			*/
			private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception {
			boolean flag = true;
			List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
			//.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
			.eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
			.orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
			);
			if (CollUtil.isNotEmpty(list)){
			DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0);
			if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){
			flag = true;
			}else {
			flag = false;
			}
			//daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode);
			}else {
			flag = false;
			log.info("读取到工位{},测试设备返回的数据查询不到，电芯码为：{}",device,cellCode);
			}
			return flag;
			}
			/**
			* 030工位返回ocv测试结果
			* @param thoroughfare
			* @param device
			* @throws Exception
			*/
			private boolean OCVResultFeedBack(String thoroughfare, String device) throws Exception {