From 3c8909327df2b42d79a8b30ffa8e816419574653 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 09 九月 2024 15:43:55 +0800
Subject: [PATCH] 人工批量报工
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 21 +++++++++------------
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | 8 ++++----
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
index 947e5ca..0c56316 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -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";
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index 01f3dad..1afb400 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -73,6 +73,9 @@
@Autowired
private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
+ @Autowired
+ private IBsBeatSettingService bsBeatSettingService;
+
/**
* 瀵煎嚭鐐规浠诲姟鍒楄〃
*/
@@ -135,19 +138,13 @@
}
@GetMapping("/productionOrderComponentRequest")
- public AjaxResult productionOrderComponentRequest(BsFormulaChildInfo bsFormulaChildInfo){
- List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
- .eq(BsFormulaChildInfo::getOperationType, "2")
- );
- List<ProductionOrderComponentRequest> requests = new ArrayList<>();
- for (BsFormulaChildInfo info : list) {
- ProductionOrderComponentRequest request = new ProductionOrderComponentRequest();
- request.setMaterialCode(info.getMaterialCode());
- request.setOperationSteps(info.getOperationSteps());
- requests.add(request);
+ public AjaxResult productionOrderComponentRequest(@RequestParam String stationCode,@RequestParam String confirmTime){
+ List<BsBeatSetting> list = bsBeatSettingService.list();
+ for (BsBeatSetting bsBeatSetting : list) {
+ String workReportResultFeedback = RestfulService.getWorkReportResultFeedback(bsBeatSetting.getProductCode(), stationCode, confirmTime);
+ System.out.println(workReportResultFeedback);
}
- return AjaxResult.success(requests);
+ return AjaxResult.success();
}
/**
--
Gitblit v1.9.3