From 68f0c8f92fb7c82dc447b9aaed2d23760c546f25 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期五, 17 五月 2024 20:22:20 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 70 ++++++++++++++++++++++++++++++----- 1 files changed, 60 insertions(+), 10 deletions(-) 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 a1a0b2c..9e5c973 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 @@ -9,6 +9,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.jcdm.common.core.domain.AjaxResult; +import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; +import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService; import com.jcdm.main.constant.Constants; import com.jcdm.main.da.paramCollection.domain.DaParamCollection; import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; @@ -18,22 +20,16 @@ import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; -import com.jcdm.main.restful.qingYan.doman.ChildVO; -import com.jcdm.main.restful.qingYan.doman.ParentVO; -import com.jcdm.main.restful.qingYan.doman.PostEntity; +import com.jcdm.main.restful.qingYan.doman.*; +import org.aspectj.weaver.loadtime.Aj; 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 javax.annotation.Resource; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -49,6 +45,15 @@ @Autowired private IOmProductionOrdeInfoService productionOrdeInfoService; + + @Autowired + private IOmProductionOrdeInfoService omProductionOrdeInfoService; + + @Autowired + private IBsFormulaChildInfoService bsFormulaChildInfoService; + + private IDaPassingStationCollectionService passingStationCollectionService; + String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; @@ -147,6 +152,51 @@ return AjaxResult.success(execute.body()); } + @GetMapping("/productionWorkOrderRequest") + public AjaxResult productionWorkOrderRequest(){ + List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(); + List<RestFulOrder> restFulOrders = new ArrayList<>(); + for (OmProductionOrdeInfo omProductionOrdeInfo : list) { + RestFulOrder order = new RestFulOrder(); + order.setProductionOrderNum(omProductionOrdeInfo.getWorkOrderNo()); + order.setProductNum(omProductionOrdeInfo.getProductNum()); + order.setMaterialCode(omProductionOrdeInfo.getMaterialCode()); + order.setStationCode(omProductionOrdeInfo.getStationCode()); +// order.setPlanQty(omProductionOrdeInfo.getPlanQty()); + restFulOrders.add(order); + } + return AjaxResult.success(restFulOrders); + } + + @GetMapping("/getQualityData") + public AjaxResult getQualityData(){ + List<DaPassingStationCollection> qualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "1")); + List<DaPassingStationCollection> unQualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "2")); + Map<String,Integer> map = new HashMap<>(); + map.put("qualified",qualified.size()); + map.put("unQualified",unQualified.size()); + return AjaxResult.success(map); + } + + + + @GetMapping("/productionOrderComponentRequest") + public AjaxResult productionOrderComponentRequest(BsFormulaChildInfo bsFormulaChildInfo){ + Map<String,List<String>> map = new HashMap<>(); + 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); + } + return AjaxResult.success(requests); + } + @PostMapping("/pushParamData") public void receivingData(@RequestBody PostEntity postEntity) throws JsonProcessingException { -- Gitblit v1.9.3