Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 c71714508fbe3ace3543423c7700d7bbcca90056

 src/main/java/org/jeecg/modules/sap/controller/SAPTestController.java

@@ -4,15 +4,15 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.sap.request.MaterialRequest;
import org.jeecg.modules.sap.request.OrderLoadRequest;
import org.jeecg.modules.sap.request.OrderReportRequest;
import org.jeecg.modules.sap.request.ProductionOrderSyncRequest;
import org.jeecg.modules.sap.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

@Api(tags = "SAP集成测试")
@@ -48,71 +48,81 @@
    private OrderLoadService orderLoadService;
    @Autowired
    private OrderCloseService orderCloseService;

//    @ApiOperation(value = "SAP集成测试-测试接口", notes = "SAP集成测试-测试接口")
//    @GetMapping("/test")
//    public Result<?> test() {
//        String test = sapService.test();
//        return Result.ok(test);
//    }
    @Autowired
    private OrderMaterialRequestService orderMaterialRequestService;

    @ApiOperation(value = "SAP集成测试-生产订单同步接口", notes = "SAP集成测试-生产订单同步接口")
    @GetMapping("/syncProductionOrder")
    public Result<?> syncProductionOrder() throws Exception {
        Map<String, Object> resultMap = productionOrderSync.syncProductionOrder(factoryCode, orderTypeCode1, productionManager, orderStatus, null, null, null, null);
    @PostMapping("/syncProductionOrder")
    public Result<?> syncProductionOrder(@RequestBody ProductionOrderSyncRequest request) throws Exception {
//        ProductionOrderSyncRequest request = new ProductionOrderSyncRequest();
//        request.setFactoryCode(factoryCode);
//        request.setOrderTypeCode(orderTypeCode1);
//        request.setProductionManager(productionManager);
//        request.setOrderStatus(orderStatus);
//        request.setOrderCode("10711342");
        Map<String, Object> resultMap = productionOrderSync.syncProductionOrder(request);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-订单BOM同步", notes = "SAP集成测试-订单BOM同步")
    @GetMapping("/syncOrderBom")
    public Result<?> syncOrderBom() throws Exception {
        String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543";
    public Result<?> syncOrderBom(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "orderCode") String orderCode) throws Exception {
//        String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543";
        Map<String, Object> resultMap = orderBomSync.syncOrderBom(factoryCode, orderCode);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-订单工序同步", notes = "SAP集成测试-订单工序同步")
    @GetMapping("/syncOrderProcess")
    public Result<?> syncOrderProcess() throws Exception {
        String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543";
    public Result<?> syncOrderProcess(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "orderCode") String orderCode) throws Exception {
//        String orderCode = "10706312,10706988,10708077,10708078,10708825,10711404,10711404,10711543";
        Map<String, Object> resultMap = orderProcessSync.syncOrderProcess(factoryCode, orderCode);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-工序报工", notes = "SAP集成测试-工序报工")
    @GetMapping("/productionOrderReport")
    public Result<?> productionOrderReport() throws Exception {
        OrderReportRequest request = new OrderReportRequest();
        request.setFactoryCode(factoryCode);
        request.setOrderCode("10711404");
        request.setWarehouseCode("7014"); //2# 线边库
        request.setProcessCode("0040");
        request.setQualifiedQuantity(new BigDecimal("180"));
        request.setScrapQuantity(new BigDecimal("0"));
        request.setKeyProcess("202505080102");
    @PostMapping("/productionOrderReport")
    public Result<?> productionOrderReport(@RequestBody OrderReportRequest request) throws Exception {
//        OrderReportRequest request10 = new OrderReportRequest();
//        request10.setFactoryCode(factoryCode);
//        request10.setOrderCode("10711404");
//        request10.setWarehouseCode("7014"); //2# 线边库
//        request10.setProcessCode("0010");
//        request10.setQualifiedQuantity(new BigDecimal("180"));
//        request10.setScrapQuantity(new BigDecimal("0"));
//        request10.setKeyProcess("202505080101");
//        request10.setBatchNumber("202505080101");
        Map<String, Object> resultMap = orderReportService.productionOrderReport(request);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-生产订单投料", notes = "SAP集成测试-生产订单投料")
    @GetMapping("/productionOrderLoad")
    public Result<?> productionOrderLoad() throws Exception {
        OrderLoadRequest request = new OrderLoadRequest();
        request.setFactoryCode(factoryCode);
        request.setOrderCode("10711404");
        request.setWarehouseCode("7014"); //2# 线边库
        request.setMaterialNumber("320013727");
        request.setQuantity(new BigDecimal("180"));
        request.setBatchNumber("202505080102");
    @PostMapping("/productionOrderLoad")
    public Result<?> productionOrderLoad(@RequestBody OrderLoadRequest request) throws Exception {
//        OrderLoadRequest request = new OrderLoadRequest();
//        request.setFactoryCode(factoryCode);
//        request.setOrderCode("10711404");
//        request.setWarehouseCode("7014"); //2# 线边库
//        request.setMaterialNumber("320013727");
//        request.setQuantity(new BigDecimal("180"));
//        request.setBatchNumber("202505080102");
        Map<String, Object> resultMap = orderLoadService.productionOrderLoad(request);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-生产订单关闭", notes = "SAP集成测试-生产订单关闭")
    @GetMapping("/productionOrderClose")
    public Result<?> productionOrderClose() throws Exception {
        String orderCode = "10711404";
    public Result<?> productionOrderClose(@RequestParam(value = "orderCode") String orderCode) throws Exception {
//        String orderCode = "10698749";
        Map<String, Object> resultMap = orderCloseService.productionOrderClose(orderCode);
        return Result.ok(resultMap);
    }

    @ApiOperation(value = "SAP集成测试-物料拉动", notes = "SAP集成测试-物料拉动")
    @PostMapping("/orderMaterialRequest")
    public Result<?> orderMaterialRequest(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "warehouseCode") String warehouseCode, @RequestBody List<MaterialRequest> request) throws Exception {
//        String orderCode = "10698749";
        Map<String, Object> resultMap = orderMaterialRequestService.orderMaterialRequest(factoryCode, warehouseCode, request);
        return Result.ok(resultMap);
    }
}