Jcdm042-Mes-Module-One.git

			@@ -313,7 +313,7 @@
			try{
			CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
			logger.info("OP100报工开始-工厂MES异步方法");
			String stationCode = "M1OP100";
			String stationCode = "M1P100";//因为上层系统只支持6为，所有报工工位为M1P100
			String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
			JSONObject jsonObject = new JSONObject(reportResult);
			String code = jsonObject.getStr("code");
			@@ -566,7 +566,7 @@
			// childVO.setItemType("3");
			// }
			if(paramConfOne!=null){
			childVO.setItemType(paramConfOne.getSpareField1());
			childVO.setItemType(paramConfOne.getItemType());
			childVO.setItemText(paramConfOne.getCollectParameterName());
			}else {
			childVO.setItemType("3");

			@@ -508,9 +508,9 @@
			//插入参数采集表
			daParamCollectionService.insertBatch(collectionList);

			//如果220工位，进行报工
			//如果220工位，进行报工,因为上层系统只支持6位，所有报工工位修改为M1P220
			if("M1OP220".equals(device)) {
			getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
			getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date()));
			}

			//上传到工厂mes

	jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史