Jcdm035-Mes.git

			@@ -73,10 +73,10 @@
			public static final Integer INT_THREE= 3;
			public static final Integer INT_FOUR= 4;
			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_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";*/
			/* 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_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";
			public static final String FACTORY_EMS_SITE_CODE = "3983";

			@@ -378,7 +378,8 @@
			List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
			.eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
			.eq(OmProductionOrdeInfo::getStationCode,device)//工位
			.eq(OmProductionOrdeInfo::getProductCode,materialCode));//产品类型
			//.eq(OmProductionOrdeInfo::getProductCode,materialCode)
			);//产品类型
			if (CollUtil.isNotEmpty(orderList)){
			Long id = orderList.get(0).getId();
			productNum = orderList.get(0).getProductNum();//产品码
			@@ -386,9 +387,9 @@
			}else{
			// 查询最新的工单信息
			OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
			String facMaterialCode = Constants.facMaterialMap.get(materialCode);
			log.info("请求工厂MES工单：入参device{},请求工厂物料编码facMaterialCode：{},产品物料编码MaterialCode{}", device, facMaterialCode,materialCode);
			String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), device,facMaterialCode);
			//String facMaterialCode = Constants.facMaterialMap.get(materialCode);
			log.info("请求工厂MES工单：入参device{},请求工厂物料编码,产品物料编码MaterialCode{}", device,materialCode);
			String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), device,"");
			log.info("请求工厂MES工单：出参pack：{}", orderJsonString);

			JSONObject jsonObject = new JSONObject(orderJsonString);

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