Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-12-01 1e56bd5cc3be7f7957788f2606c7f56cb4d27f50

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson.JSONObject;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
@@ -11,6 +12,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
import com.example.erp.tools.DownExcel;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +39,7 @@
    @SaCheckPermission("createOrder.add")
    public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
        if(orderService.saveOrder(orderMap))    {
            return Result.seccess(true);
            return Result.success(true);
        }else{
            throw new ServiceException(Constants.Code_500,Constants.Code_msg);
        }
@@ -46,7 +48,7 @@
    @PostMapping("/saveOtherSystemOrder")
    public Result saveOtherSystemOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
        if(orderService.saveOrder(orderMap))    {
            return Result.seccess(true);
            return Result.success(true);
        }else{
            throw new ServiceException(Constants.Code_500,Constants.Code_msg);
        }
@@ -57,7 +59,7 @@
    @SaCheckPermission("createOrder.add")
    public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
        if(orderService.saveOrderTitle(orderMap))    {
            return Result.seccess(true);
            return Result.success(true);
        }else{
            throw new ServiceException(Constants.Code_500,Constants.Code_msg);
        }
@@ -67,39 +69,39 @@
    @SaCheckPermission("createOrder.search")
    @PostMapping("/selectOrder")
    public Result selectOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
        return Result.seccess(orderService.selectOrder(orderMap));
        return Result.success(orderService.selectOrder(orderMap));
    }
    @ApiOperation("订单分页筛选查询")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
    public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Map<String,Object> config)  {
        return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
        return Result.success(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
    }
    @ApiOperation("删除订单")
    @SaCheckPermission("selectOrder.delete")
    @PostMapping("/deleteOrder/{id}")
    public Result deleteOrder(@PathVariable String id)  {
        return Result.seccess(orderService.deleteOrder(id));
        return Result.success(orderService.deleteOrder(id));
    }

    @ApiOperation("订单作废")
    @SaCheckPermission("createOrder.cancel")
    @PostMapping("/cancelOrder/{id}")
    public Result cancelOrder(@PathVariable String id)  {
        return Result.seccess(orderService.cancelOrder(id));
        return Result.success(orderService.cancelOrder(id));
    }

    @ApiOperation("根据id获取订单信息")
    @PostMapping("/getOrderById/{id}")
    public Result getOrderById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderById(id));
        return  Result.success(orderService.getOrderById(id));
    }

    @ApiOperation("根据id获取订单明细信息")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/getOrderDetailById/{id}")
    public Result getOrderDetailById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderDetailById(id));
        return  Result.success(orderService.getOrderDetailById(id));
    }


@@ -109,12 +111,12 @@
    @SaCheckPermission("updateOrderCraft.search")
    @PostMapping("/getOrderCraftById/{id}")
    public Result getOrderCraftById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderCraftById(id));
        return  Result.success(orderService.getOrderCraftById(id));
    }

    @PostMapping("/getOrderCraftDetailById/{id}")
    public Result getOrderCraftDetailById(@PathVariable String id)  {
        return  Result.seccess(orderService.getOrderCraftDetailById(id));
        return  Result.success(orderService.getOrderCraftDetailById(id));
    }
    @ApiOperation("审核订单")
    @SaCheckPermission("createOrder.review")
@@ -122,31 +124,33 @@
    public Result reviewOrderById(@PathVariable String id,
                                  @PathVariable Integer status
                                      ,@PathVariable String userId,@PathVariable String userName)  {
        return  Result.seccess(orderService.reviewOrderById(id,status,userId,userName));
        return  Result.success(orderService.reviewOrderById(id,status,userId,userName));
    }

    @ApiOperation("审核工艺")
    @SaCheckPermission("updateOrderCraft.review")
    @PostMapping("/reviewProcessById/{id}/{status}")
    public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails)  {
        return  Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
        return  Result.success(orderService.reviewProcessById(id,status,orderGlassDetails));
    }

    @ApiOperation("更新订单金额单价")
    @SaCheckPermission("createOrder.amountReset")
    @PostMapping("/updateOrderMoney")
    public Result updateOrderMoney(@RequestBody Map<String,Object> map)  {
        return  Result.seccess(orderService.updateOrderMoney(map));
        return  Result.success(orderService.updateOrderMoney(map));
    }

    @SaCheckPermission("orderReport.search")
    @ApiOperation("查询订单报表")
    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}/{model}/{scope}")
    public Result getOrderReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @PathVariable Integer model,//0:精确查找，1：模糊查询
                                 @PathVariable Integer scope,//模糊范围
                                 @RequestBody OrderDetail orderDetail)  {
        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
        return  Result.success(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));

    }

@@ -157,7 +161,7 @@
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody OrderDetail orderDetail)  {
        return  Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
        return  Result.success(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));

    }

@@ -168,7 +172,7 @@
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody Order order)  {
        return  Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
        return  Result.success(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));

    }

@@ -199,69 +203,92 @@
    @ApiOperation("订单小片标签")
    @PostMapping("/getOrderProductDetailTag/{orderId}")
    public Result getOrderProductDetailTag(@PathVariable String orderId)  {
        return   Result.seccess(orderService.getOrderProductDetailTag(orderId));
        return   Result.success(orderService.getOrderProductDetailTag(orderId));
    }

    @ApiOperation("订单加工单打印-成品")
    @GetMapping ("/printOrderProductDetail/{orderId}")
    public Result printOrderProductDetail(@PathVariable String orderId)  {

        return   Result.seccess(orderService.printOrderProductDetail(orderId));
        return   Result.success(orderService.printOrderProductDetail(orderId));
    }

    @ApiOperation("订单加工单打印-小片明细")
    @GetMapping ("/printOrderProductGlassDetail/{orderId}")
    public Result printOrderProductGlassDetail(@PathVariable String orderId)  {
        return   Result.seccess(orderService.printOrderProductGlassDetail(orderId));
        return   Result.success(orderService.printOrderProductGlassDetail(orderId));
    }
    @ApiOperation("订单加工单打印-小片明细1")
    @PostMapping ("/printOrderProductGlassDetailMonolithic/{orderId}")
    public Result printOrderProductGlassDetailMonolithic(@PathVariable String orderId,@RequestBody List<String> selectedValues)  {
        return   Result.seccess(orderService.printOrderProductGlassDetailMonolithic(orderId,selectedValues));
        return   Result.success(orderService.printOrderProductGlassDetailMonolithic(orderId,selectedValues));
    }
    @ApiOperation("订单加工单打印-成品2")
    @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
    public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues)  {

        return   Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
        return   Result.success(orderService.printOrderProductDetails(orderId,selectedValues));
    }

    @ApiOperation("订单打印计数")
    @PostMapping ("/updateOrderPrintNumber/{orderId}")
    public Result updateOrderPrintNumber(@PathVariable String orderId)  {

        return  Result.seccess(orderService.updateOrderPrintNumber(orderId));
        return  Result.success(orderService.updateOrderPrintNumber(orderId));
    }

    @ApiOperation("修改订单号")
    @SaCheckPermission("createOrder.amountReset")
    @PostMapping("/updateOrderId")
    public Result updateOrderId(@RequestBody Map<String,Object> map)  {
        return  Result.seccess(orderService.updateOrderId(map));
        return  Result.success(orderService.updateOrderId(map));
    }

    @ApiOperation("订单反审是否存在手动大小片")
    @PostMapping("/selectDifferentSize/{orderId}")
    public Result selectDifferentSize(@PathVariable String orderId)  {
        return  Result.seccess(orderService.selectDifferentSize(orderId));
        return  Result.success(orderService.selectDifferentSize(orderId));
    }

    @ApiOperation("退回流程")
    @PostMapping("/processBack/{orderId}/{status}")
    public Result processBack(@PathVariable String orderId,@PathVariable Integer status)  {
        return  Result.seccess(orderService.processBack(orderId,status));
        return  Result.success(orderService.processBack(orderId,status));
    }

    @ApiOperation("手机扫码玻璃信息")
    @PostMapping("/scannerGlassInfo/{projectNo}")
    public Result scannerGlassInfo(@PathVariable String projectNo)  {
        return  Result.seccess(orderService.scannerGlassInfo(projectNo));
        return  Result.success(orderService.scannerGlassInfo(projectNo));
    }

    @PostMapping("/test")
    public Result scannerGlassInfo()  {
        return  Result.seccess(null);
        return  Result.success(null);
    }

    @PostMapping("/upload-dxf")
    public Result uploadDxf(@RequestBody Map<String,Object> object) {
        return  Result.success(orderService.uploadDxf(object));
    }

    @PostMapping("/selectUploadDxf")
    public Result selectUploadDxf(@RequestBody Map<String,Object> object) {
        return  Result.success(orderService.selectUploadDxf(object));
    }

    @PostMapping("/updateOrderFile")
    public Result updateOrderFile(@RequestBody JSONObject map) throws JsonProcessingException {
        return  Result.success(orderService.updateOrderFile(map));
    }


    @ApiOperation("查询工艺属性配置")
    @PostMapping("/processAttributeConfig")
    public Result processAttributeConfig()  {
        return  Result.success(orderService.processAttributeConfig());
    }



}