jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -1,7 +1,9 @@ package com.jcdm.main.constant; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; public class Constants { @@ -15,6 +17,8 @@ public static final List<String> ModuleList = new ArrayList<>();//模组工位,用于校验是否传入模组码 public static final Map<String,String> materialMap = new HashMap();//人工工位 public static final String NG = "2"; public static final String UN_PASS= "不合格"; public static final String PASS= "合格"; jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -48,6 +48,11 @@ @Override public void run(ApplicationArguments args) throws Exception { //PLC到MES物料转换 Constants.materialMap.put("1","9900199052A"); Constants.materialMap.put("2","9900199053B"); //分段010-090段 电芯工位 Constants.OP020_OP090.add(Constants.OP020); Constants.OP020_OP090.add(Constants.OP030); @@ -59,7 +64,7 @@ //人工工位 Constants.OP100_OP150.add(Constants.OP100_1); Constants.OP100_OP150.add(Constants.OP100_2); //Constants.OP100_OP150.add(Constants.OP150); Constants.OP100_OP150.add(Constants.OP150); //模组工位List Constants.ModuleList.add(Constants.OP110); jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -266,7 +266,7 @@ try { // 查询最新的工单信息 OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100"); String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "MOP100"); JSONObject jsonObject = new JSONObject(orderJsonString); // 从JSONObject中获取data对象 JSONObject dataObject = jsonObject.getJSONObject("data");