From b9df2fc5c64a1d989991655a9e42e4d1f2ec4075 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 06 三月 2025 18:18:11 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/api/RestfulAPI.java | 121 +++++++++++++++------------------------
1 files changed, 47 insertions(+), 74 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
index 2553861..d825e5c 100644
--- a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
+++ b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
@@ -1,24 +1,15 @@
package com.billion.main.api;
-import cn.hutool.core.collection.CollUtil;
-import com.billion.main.api.domain.OutPutParameters;
-import com.billion.main.api.domain.OutPutParametersChild;
+import com.billion.main.api.domain.ApiResponse;
+import com.billion.main.api.domain.CollectQualityData;
import com.billion.main.api.domain.WorkOrdersInfo;
-import com.billion.main.api.domain.WorkOrdersInfoChild;
-import com.billion.main.bs.domain.BsBomChildInfo;
-import com.billion.main.bs.domain.BsBomInfo;
-import com.billion.main.bs.service.IBsBomChildInfoService;
-import com.billion.main.bs.service.IBsBomInfoService;
-import com.billion.main.om.domain.OmProductionOrderInfo;
-import com.billion.main.om.service.IOmProductionOrderInfoService;
+import com.billion.main.api.service.IWorkOrdersInfoService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
+
@RestController
//@Component
@@ -26,11 +17,7 @@
public class RestfulAPI {
@Autowired
- private IOmProductionOrderInfoService OmProductionOrderInfoService;
- @Autowired
- private IBsBomInfoService bsBomInfoService;
- @Autowired
- private IBsBomChildInfoService bsBomChildInfoService;
+ private IWorkOrdersInfoService iWorkOrdersInfoService;
public static final String getQualityData = "IP鍦板潃/CollectQualityData";
/**
@@ -39,64 +26,50 @@
* 2銆佷骇绾縈ES灏嗘帴鏀跺埌鐨勫伐鍗曚俊鎭瓨鍏ュ埌宸ュ崟琛ㄥ拰BOM琛�
*/
@PostMapping("/receiveWorkOrdersInfo")
- public OutPutParameters receiveWorkOrdersInfo(@RequestBody WorkOrdersInfo workOrdersInfo) {
- //淇濆瓨鍙傛暟
- List<OmProductionOrderInfo> productionOrderInfoList = new ArrayList<>();
- List<BsBomInfo> bomInfoList = new ArrayList<>();
- List<BsBomChildInfo> bomChildInfoList = new ArrayList<>();
- List<WorkOrdersInfoChild> data = workOrdersInfo.getData();
- for (WorkOrdersInfoChild workOrdersInfoChild : data) {
- OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
- BsBomInfo bsBomInfo = new BsBomInfo();
- BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
- //淇濆瓨宸ュ崟淇℃伅
- omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
- omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
- omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());
- omProductionOrderInfo.setEngineTye(workOrdersInfo.getEngineType());
- omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
- omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProduction_Plan()));
- omProductionOrderInfo.setPlanStartTime(workOrdersInfo.getStartTime());
- omProductionOrderInfo.setRemarks(workOrdersInfo.getDescription());
- omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
- omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
- //淇濆瓨BOM涓昏〃淇℃伅
- bsBomInfo.setBomCode(workOrdersInfo.getBomName());
- bsBomInfo.setBomName(workOrdersInfo.getBomName());
- bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
- bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
- //淇濆瓨BOM瀛愯〃淇℃伅
- bsBomChildInfo.setProductCode(workOrdersInfo.getMaterialNumber());
- bsBomChildInfo.setProductName(workOrdersInfo.getMaterialNumber());
- bsBomChildInfo.setBomCode(workOrdersInfo.getBomName());
- bsBomChildInfo.setLocationCode(workOrdersInfoChild.getStationName());
- bsBomChildInfo.setLocationName(workOrdersInfoChild.getStationName());
- bsBomChildInfo.setMaterialCode(workOrdersInfoChild.getMaterial());
- bsBomChildInfo.setCostQty(workOrdersInfoChild.getCount());
- bsBomChildInfo.setChecked(workOrdersInfoChild.getChecked());
- bsBomChildInfo.setMaterialName(workOrdersInfoChild.getMaterialName());
- //
+ public ApiResponse receiveWorkOrdersInfo(@RequestBody WorkOrdersInfo workOrdersInfo) {
+ try {
+ // 璋冪敤service灞備繚瀛樻暟鎹�
+ boolean saveResult = iWorkOrdersInfoService.saveWorkOrders(workOrdersInfo);
+ // 鏋勫缓鍝嶅簲鏁版嵁
+ ApiResponse response = new ApiResponse();
+ List<ApiResponse.ResponseData> dataList = new ArrayList<>();
+ ApiResponse.ResponseData responseData = new ApiResponse.ResponseData();
+ if (saveResult) {
+ response.setCode("success");
+ response.setMessage("API璋冪敤鎴愬姛");
+ responseData.setProductionID(workOrdersInfo.getProductionID());
+ responseData.setResultCode("S");
+ responseData.setResultText("閲囬泦瀹屾垚");
+ } else {
+ response.setCode("fail");
+ response.setMessage("API璋冪敤澶辫触");
+ responseData.setProductionID(workOrdersInfo.getProductionID());
+ responseData.setResultCode("F");
+ responseData.setResultText("閲囬泦澶辫触");
+ }
+ dataList.add(responseData);
+ response.setData(dataList);
+ return response;
+ } catch (Exception e) {
+ // 寮傚父澶勭悊
+ ApiResponse response = new ApiResponse();
+ response.setCode("fail");
+ response.setMessage("API璋冪敤澶辫触");
+ List<ApiResponse.ResponseData> dataList = new ArrayList<>();
+ ApiResponse.ResponseData responseData = new ApiResponse.ResponseData();
+ responseData.setProductionID(workOrdersInfo.getProductionID());
+ responseData.setResultCode("F");
+ responseData.setResultText("閲囬泦澶辫触");
+ dataList.add(responseData);
+ response.setData(dataList);
+ return response;
}
- OutPutParameters outputParams = new OutPutParameters();
- //鍒ゆ柇淇濆瓨鐨勪笁涓猯ist鏄惁涓虹┖
- if (CollUtil.isNotEmpty(productionOrderInfoList) && CollUtil.isNotEmpty(bomInfoList) && CollUtil.isNotEmpty(bomChildInfoList)) {
- //鎻掑叆鏁版嵁搴�
- OmProductionOrderInfoService.insertBatch(productionOrderInfoList);
- bsBomInfoService.insertBatch(bomInfoList);
- bsBomChildInfoService.insertBatch(bomChildInfoList);
- //鍑哄弬
- OutPutParametersChild child = new OutPutParametersChild(workOrdersInfo.getMaterialNumber(), "S", "閲囬泦瀹屾垚");
- outputParams.addData(child);
- outputParams.toJson();
- } else {
- OutPutParametersChild child = new OutPutParametersChild(workOrdersInfo.getMaterialNumber(), "F", "閲囬泦澶辫触");
- outputParams.addData(child);
- outputParams.toJson();
- }
-
- return outputParams;
}
+ @PostMapping("/CollectQualityData")
+ public CollectQualityData CollectQualityData(@RequestBody CollectQualityData collectQualityData){
+ return collectQualityData;
+ }
}
--
Gitblit v1.9.3