hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -10,7 +10,7 @@ /** * <p> * 服务类 * 服务类 * </p> * * @author wu @@ -28,12 +28,14 @@ /** * 按照玻璃id信息自动报工 * * @param glassId * @param deviceId * @param workingProcedure * @param remark */ void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark,int type); void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type); /** * 单个破损 * @@ -54,5 +56,5 @@ void deleteByGlassId(String glassId); Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails); Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -55,7 +55,8 @@ WorkAssignmentMapper workAssignmentMapper; private final static String ERP_URL = "http://192.168.2.100:8086"; private final static String ERP_URL = "http://192.168.2.100:8086"; // private final static String ERP_URL = "http://10.153.19.174:8086"; /** @@ -98,9 +99,9 @@ reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11)); reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber()); // reportingWork.setDeviceName(damages.get(0).getDeviceName()); if (StringUtils.isBlank(damages.get(0).getDeviceName())){ if (StringUtils.isBlank(damages.get(0).getDeviceName())) { reportingWork.setDeviceName("auto"); }else{ } else { reportingWork.setDeviceName(damages.get(0).getDeviceName()); } reportingWork.setThisProcess(damages.get(0).getWorkingProcedure()); @@ -144,7 +145,7 @@ } reportingWorkDetails.add(reportingWorkDetail); reportingWorkDetail.setDamageDetailsList(damageDetailses); sendToERP(reportingWork, reportingWorkDetails); sendToERP(reportingWork, reportingWorkDetails, Boolean.FALSE); } } @@ -154,9 +155,9 @@ reportingWork.setOrderId(damage.getProcessId().substring(0, 10)); reportingWork.setProductionId(damage.getProcessId().substring(0, 11)); reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber()); if (StringUtils.isBlank(damage.getDeviceName())){ if (StringUtils.isBlank(damage.getDeviceName())) { reportingWork.setDeviceName("auto"); }else{ } else { reportingWork.setDeviceName(damage.getDeviceName()); } reportingWork.setThisProcess(damage.getWorkingProcedure()); @@ -174,7 +175,7 @@ reportingWorkDetail.setCompletedQuantity(1); reportingWorkDetail.setBreakageQuantity(0); reportingWorkDetails.add(reportingWorkDetail); return sendToERP(reportingWork, reportingWorkDetails); return sendToERP(reportingWork, reportingWorkDetails, Boolean.TRUE); } @Override @@ -312,12 +313,20 @@ } @Override public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails) { public Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type) { log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails); try { // 目标系统的API URL // String url = ERP_URL + "/reportingWork/mesReportingWork"; String url = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn"; String url1 = ERP_URL + "/reportingWork/mesReportingWork"; String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn"; String url; if (type) { url = url1; } else { url = url2; } URL obj = new URL(url); HttpURLConnection con = (HttpURLConnection) obj.openConnection(); @@ -333,19 +342,26 @@ ObjectMapper objectMapper = new ObjectMapper(); // 将 ReportingWork 转换为 JSONObject // 将 ReportingWorkDetail 列表转换为 JSONArray if (type) { JSONObject detailsJsonObject = new JSONObject(objectMapper.writeValueAsString(reportingWorkDetails.get(0))); result.put("detail", detailsJsonObject); reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14)); } else { JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails)); result.put("detail", detailsJsonArray); } JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork)); reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); // 将 ReportingWorkDetail 列表转换为 JSONArray JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails)); // 将 JSON 对象和数组添加到结果对象中 result.put("title", reportingWorkJson); result.put("detail", detailsJsonArray); result.put("type", 0); result.put("userId", "admin"); result.put("userName", "admin"); result.put("qualityInsStatus", 0); // 将 result 对象转换为字符串 String jsonInputString = result.toString(); System.out.println("jsonInputString : " + result); @@ -372,7 +388,7 @@ // 提取 code 和 message int code = jsonResponse.getInt("code"); String message = jsonResponse.getStr("data"); log.info("报工失败：{},{}", code, message); log.info("报工情况：{},{}", code, message); if (code == 200 && message.equals("true")) { return true; } else { hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -6,7 +6,7 @@ cloud: nacos: discovery: server-addr: 127.0.0.1:8849 server-addr: 127.0.0.1:8848 gateway: discovery: locator: hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: dev application: name: cacheGlass liquibase: @@ -15,8 +15,8 @@ thread-name-prefix: task-cache mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: threshold: 3 ratio: 10 @@ -37,4 +37,14 @@ cellLength: 2500 sequence: order: false kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv
@@ -30,7 +30,7 @@ password: 123456 kangaroohy: milo: enabled: true enabled: false primary: default config: default: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: dev application: name: cacheVerticalGlass liquibase: @@ -15,8 +15,8 @@ thread-name-prefix: task-cacheVertical mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: sequence: order: true hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -144,6 +144,8 @@ } @Test public void computeTargetByLine() { plcStorageCageTask.computeTargetByLine(2001); @@ -172,13 +174,18 @@ @Test public void insertDamage() { Damage damage=new Damage(); damage.setGlassId("P24060403|3|6"); damage.setLine(2001); damage.setWorkingProcedure("冷加工"); damage.setRemark(""); damage.setStatus(2); damageService.insertDamage(damage); // Damage damage=new Damage(); // damage.setGlassId("P24060403|3|6"); // damage.setLine(2001); // damage.setWorkingProcedure("冷加工"); // damage.setRemark(""); // damage.setStatus(2); // damageService.insertDamage(damage); Damage damage=damageService.getOne( new LambdaQueryWrapper<Damage>() .eq(Damage::getGlassId,"P24082703|1|80") ); damageService.submitReport(damage); } @Test hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -26,3 +26,13 @@ host: 127.0.0.1 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: dev application: name: glassStorage liquibase: hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -30,4 +30,14 @@ database: 0 host: 127.0.0.1 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -2,12 +2,12 @@ port: 10015 spring: profiles: active: prod active: dev application: name: loadGlass liquibase: enabled: false mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@ port: 10016 spring: profiles: active: prod active: dev application: name: temperingGlass liquibase: hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml
@@ -27,4 +27,14 @@ database: 0 host: 127.0.0.1 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: dev application: name: hollowGlass liquibase:
