Jcdm042-Mes-Module-One.git

			@@ -61,7 +61,7 @@
			public static final Integer INT_ZERO= 0;
			public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
			public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";
			/* public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
			/*public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
			public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";*/
			public static final String FACTORY_EMS_SITE_CODE = "3983";

			@@ -163,7 +163,9 @@
			String productType = productTypeObjcet.toString();//产品类型
			String materialCode = Constants.materialMap.get(productType);
			//调用工厂MES，保存到数据库,并且将工单传给PLC
			receivingWorkOrders(thoroughfare, device,materialCode);
			CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
			receivingWorkOrders(thoroughfare, device,materialCode);
			});
			miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
			log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
			}else{
			@@ -265,7 +267,7 @@
			}
			}

			public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
			public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
			{
			String paramProductNum = "";
			try {

	jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史