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

廖井涛

2025-10-28 fcc929fa2888c6b06a168f1ca84344e3bf9fdce5

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

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -1204,7 +1204,7 @@
            />
          </el-select>
        </el-col>
        <el-col :span="6">
        <el-col :span="9">
          <el-button type="primary" @click="dialogSave('save')">保存</el-button>
          <el-button type="primary" @click="dialogSave('copy')">复制</el-button>
          <el-button type="warning" @click="clear">清空</el-button>

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -1117,6 +1117,8 @@
        orderPlanDecomposition:'订单计划分解报表',
        secondaryBrokenReport:'次破报表',
        crossProcessBreakdown:'跨工序次破报表',
        notCrossProcessBreakdown:'非跨工序次破报表',
        secondaryBrokenTotal:'次破总报表',
        teamOutput:'班组产量报表',
        splittingDetails:'分架明细报表',
        TaskCompletionStatus:'任务完成情况报表',

 north-glass-erp/northglass-erp/src/router/index.js

@@ -881,6 +881,12 @@
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //非跨工序次破报表
              path: 'notCrossProcessBreaking',
              name: 'notCrossProcessBreaking',
              component: () => import('../views/pp/report/NotCrossProcessBreaking.vue'),
            },
            {
              //订单排产计划
              path: 'scheduleProductionSchedule',
              name: 'scheduleProductionSchedule',

 north-glass-erp/northglass-erp/src/views/pp/report/NotCrossProcessBreaking.vue

New file
@@ -0,0 +1,42 @@
<script setup>
import BasicTable from "@/components/BasicTable.vue"
import request from "@/utils/request"
import { ref} from "vue"
import {useI18n} from "vue-i18n";
const {t} = useI18n()
const childrenData = ref({
  columns:[
    {type:'expand',fixed:"left",width: 80},
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'reportingWorkTime', width: 120, title: t('reportingWorks.reportingWorkTime'), sortable: true, },
    {field: 'processId', width: 160,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'code', width: 160,title: t('reportingWorks.glassNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'thisProcess',width: 120, title: t('reportingWorks.reportingProcess'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'responsibleProcess',width: 120, title: t('reportingWorks.responsibleProcess'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'responsibleTeam', width: 130,title: t('reportingWorks.responsibleTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'breakageType', width: 120,title: t('reportingWorks.breakageType'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'breakageReason', width: 100,title: t('reportingWorks.breakageReason'), sortable: true,showOverflow:"ellipsis"},
    {field: 'breakageQuantity', width: 100,title: t('reportingWorks.quantityBroken'), sortable: true},
    {field: 'responsiblePersonnel', width: 120,title: t('rework.responsibilityInformation'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'area',width: 100, title: t('reportingWorks.wornArea'), sortable: true},
    {field: 'creator',width: 120, title: t('product.creator'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width: 120,title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId',width: 120, title: t('order.orderId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'glassChild',width: 120, title: t('reportingWorks.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
  ],//表格表头字段
  data:[],//表格数据
  url :'/report/notCrossProcessBreaking',
  exportUrl :'/report/exportNotCrossProcessBreaking',
  exportName:t('report.crossProcessBreakdown'),
  footList:['breakageQuantity','area']
})

</script>

<template>
  <basic-table
      :childrenData="childrenData"/>
</template>

<style scoped>
</style>

 north-glass-erp/northglass-erp/src/views/pp/report/Report.vue

@@ -63,8 +63,9 @@
<!--        </el-sub-menu>-->
        <el-sub-menu  index="3" popper-class="test">
          <template #title>{{$t('report.secondaryBrokenReport')}}</template>
          <el-menu-item  index="/main/report/DamageReport">{{$t('report.secondaryBrokenReport')}}</el-menu-item>
          <el-menu-item  index="/main/report/DamageReport">{{$t('report.secondaryBrokenTotal')}}</el-menu-item>
          <el-menu-item index="/main/report/CrossProcessBreaking">{{$t('report.crossProcessBreakdown')}}</el-menu-item>
          <el-menu-item index="/main/report/NotCrossProcessBreaking">{{$t('report.notCrossProcessBreakdown')}}</el-menu-item>
        </el-sub-menu>
        <el-menu-item  index="/main/report/TeamOutput">{{$t('report.teamOutput')}}</el-menu-item>
        <el-menu-item  index="/main/report/SplittingDetailsOutside">{{$t('report.splittingDetails')}}</el-menu-item>

 north-glass-erp/src/main/java/com/example/erp/common/Result.java

@@ -12,10 +12,10 @@
    private String msg;
    private Object data;

    public static  Result seccess(){
    public static  Result success(){
        return new Result(Constants.Code_200,"",null);
    }
    public static  Result seccess(Object data){
    public static  Result success(Object data){
        return new Result(Constants.Code_200,"",data);
    }


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

@@ -1,16 +1,25 @@
package com.example.erp.controller;

import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/app")
@RequiredArgsConstructor
@Api(value="App专属接口",tags={"App专属接口"})
public class AppController {
    private final OrderService orderService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
    public Result getOrderList() {
        return null;
        return Result.success(orderService.appGetOrderList());
    }
}

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

@@ -14,7 +14,7 @@

//    @GetMapping //查询order表结果集
//    public Result index(){
//        return Result.seccess(orderMapper.findAll());
//        return Result.success(orderMapper.findAll());
//
//    }
//

 north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java

@@ -20,46 +20,46 @@
    @ApiOperation("基础数据查询返回指定列")
    @GetMapping("/BasicWarehouseType/{type}")
    public Result getBasicWarehouseType(@PathVariable String type){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseType(type));
        return Result.success(basicWarehouseTypeService.getBasicWarehouseType(type));
    }

    @ApiOperation("基础数据查询返回json对象格式")
    @GetMapping("/BasicWarehouseTypes/{type}")
    public Result getBasicWarehouseTypes(@PathVariable String type){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouseTypes(type));
        return Result.success(basicWarehouseTypeService.getBasicWarehouseTypes(type));
    }

    @ApiOperation("基础数据查询")
    @SaCheckPermission("warehouseSearchBasicData.search")
    @PostMapping("/getBasicWarehouse")
    public Result getBasicWarehouse(@RequestBody Map<String,Object> map){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouse(map));
        return Result.success(basicWarehouseTypeService.getBasicWarehouse(map));
    }

    @ApiOperation("基础数据新增")
    @SaCheckPermission("warehouseSearchBasicData.add")
    @PostMapping("addBasicWarehouse")
    public Result addBasicWarehouse(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicWarehouseTypeService.addBasicWarehouse(map));
        return  Result.success(basicWarehouseTypeService.addBasicWarehouse(map));
    }
    @ApiOperation("基础数据修改")
    @SaCheckPermission("warehouseSearchBasicData.update")
    @PostMapping("updateBasicWarehouse")
    public Result updateBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
        return  Result.success(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
    }

    @ApiOperation("基础数据删除")
    @SaCheckPermission("warehouseSearchBasicData.delete")
    @PostMapping("deleteBasicWarehouse")
    public Result deleteBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
        return  Result.success(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
    }

    @ApiOperation("用户基础数据查询返回json对象格式")
    @GetMapping("/BasicWarehouseTypeUser/{type}")
    public Result BasicWarehouseTypeUser(@PathVariable String type){
        return Result.seccess(basicWarehouseTypeService.BasicWarehouseTypeUser(type));
        return Result.success(basicWarehouseTypeService.BasicWarehouseTypeUser(type));
    }

}

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java

@@ -31,43 +31,43 @@
    @ApiOperation("玻璃料架新增接口")
    @PostMapping("/saveFinishedGlassShelf")
    public Result saveFinishedGlassShelf( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGlassShelfService.saveFinishedGlassShelf(object));
        return Result.success(finishedGlassShelfService.saveFinishedGlassShelf(object));
    }

    @ApiOperation("玻璃料架库存查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}/{type}")
    public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable String type){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
    }

    @ApiOperation("玻璃料架库存查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformationById/{id}")
    public Result getSelectFinishedGlassShelfInformationById(@PathVariable Long id){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
    }

    @ApiOperation("删除玻璃料架接口")
    @PostMapping("/deleteFinishedGlassShelfInformationById")
    public Result deleteFinishedGlassShelfInformationById( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
    }

    @ApiOperation("玻璃料架新增出库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfInformationDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody List<Map<String, Object>> object){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
    }

    @ApiOperation("玻璃料架编辑出库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfEmitDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfEmitDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String emitId){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
    }

    @ApiOperation("玻璃料架出库新增接口")
    @PostMapping("/insertFinishedGlassShelfEmit")
    public Result insertFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
        return Result.success(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
    }


@@ -75,45 +75,45 @@
    @PostMapping("/getSelectFinishedGlassShelfEmit/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedGlassShelfEmit(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
                                                  @RequestBody FinishedGlassShelfEmit finishedGlassShelfEmit) throws JsonProcessingException {
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
    }

    @ApiOperation("玻璃料架出库删除接口")
    @PostMapping("/deleteFinishedGlassShelfEmit")
    public Result deleteFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
    }

    @ApiOperation("玻璃料架入库新增接口")
    @PostMapping("/insertFinishedGlassShelfWithdraw")
    public Result insertFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfWithdraw(object));
        return Result.success(finishedGlassShelfService.insertFinishedGlassShelfWithdraw(object));
    }

    @ApiOperation("玻璃料架入库查询接口")
    @PostMapping("/getSelectFinishedGlassShelfWithdraw/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedGlassShelfWithdraw(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
                                                  @RequestBody FinishedGlassShelfWithdraw finishedGlassShelfWithdraw) throws JsonProcessingException {
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdraw(pageNum,pageSize,selectDate,finishedGlassShelfWithdraw));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfWithdraw(pageNum,pageSize,selectDate,finishedGlassShelfWithdraw));
    }

    @ApiOperation("玻璃料架编辑入库明细查询接口")
    @PostMapping("/getSelectFinishedGlassShelfWithdrawDetails/{pageNum}/{pageSize}")
    public Result getSelectFinishedGlassShelfWithdrawDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String withdrawId){
        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
    }

    @ApiOperation("玻璃料架入库删除接口")
    @PostMapping("/deleteFinishedGlassShelfWithdraw")
    public Result deleteFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfWithdraw(object));
        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfWithdraw(object));
    }

    @ApiOperation("玻璃料架记录查询接口")
    @PostMapping("/getFinishedGlassShelfLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getFinishedGlassShelfLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,
                                                 @PathVariable List<String> selectDate, @RequestBody FinishedGlassShelfLog finishedGlassShelfLog){
        return Result.seccess(finishedGlassShelfService.getFinishedGlassShelfLogReport(type,pageNum,pageSize,selectDate,finishedGlassShelfLog));
        return Result.success(finishedGlassShelfService.getFinishedGlassShelfLogReport(type,pageNum,pageSize,selectDate,finishedGlassShelfLog));
    }

    @ApiOperation("玻璃料架记录报表导出")

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -38,7 +38,7 @@
    @SaCheckPermission("productStockList.search")
    @PostMapping("/getSelect/{pageNum}/{pageSize}")
    public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
        return Result.success(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
    }

    /*查询可入库的成品数据*/
@@ -46,7 +46,7 @@
    @SaCheckPermission("createProductStock.search")
    @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
    public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
        return Result.success(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
    }

    /*成品入库*/
@@ -54,7 +54,7 @@
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));

    }

@@ -63,7 +63,7 @@
    @SaCheckPermission("finishedProductOut.search")
    @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
    public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
    }

    /*成品发货*/
@@ -71,7 +71,7 @@
    @SaCheckPermission("finishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
    }

    /* 调拨查询*/
@@ -79,7 +79,7 @@
    @SaCheckPermission("orderAllocation.search")
    @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
    public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
        return Result.success(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
    }

    /*订单调拨*/
@@ -87,7 +87,7 @@
    @SaCheckPermission("orderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
    }

    /*调拨记录查询*/
@@ -95,7 +95,7 @@
    @SaCheckPermission("transferRecord.search")
    @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*订单领出*/
@@ -103,7 +103,7 @@
    @SaCheckPermission("finishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
    }

    /*领出记录查询*/
@@ -111,14 +111,14 @@
    @SaCheckPermission("takeOutRecord.search")
    @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*订单返工*/
    @ApiOperation("订单返工查询接口")
    @PostMapping("/updateFinishedGoodsInventoryRework")
    public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
    }


@@ -128,14 +128,14 @@
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
    }

    /*订单作废*/
@@ -143,7 +143,7 @@
    @SaCheckPermission("takeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
    }

    /*出入库记录查询*/
@@ -151,7 +151,7 @@
    @SaCheckPermission("storageRecord.search")
    @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
    public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
    }

    /*出入库返回*/
@@ -159,14 +159,14 @@
    @SaCheckPermission("storageRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryStorage")
    public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
    }

    @ApiOperation("成品库存记录查询接口")
    @SaCheckPermission("warehouseReport.search")
    @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedOperateLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
    }

    @ApiOperation("成品报表导出")
@@ -182,7 +182,7 @@
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/oneClickStorage/{orderId}/{userName}")
    public Result oneClickStorage( @PathVariable String  orderId,@PathVariable String  userName){
        return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
        return Result.success(finishedGoodsInventoryService.oneClickStorage(orderId,userName));

    }

@@ -191,7 +191,7 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectStorageRecordPint/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectStorageRecordPint(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*装箱打印查询*/
@@ -199,7 +199,7 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectPrint")
    public Result getSelectPrint( @RequestBody Map<String, Object> object){
        return Result.seccess(finishedGoodsInventoryService.getSelectPrintSv(object));
        return Result.success(finishedGoodsInventoryService.getSelectPrintSv(object));
    }

    /*装箱打印查询*/
@@ -207,21 +207,21 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectPrints")
    public Result getSelectPrints( @RequestBody Map<String, Object> object){
        return Result.seccess(finishedGoodsInventoryService.getSelectPrintSvs(object));
        return Result.success(finishedGoodsInventoryService.getSelectPrintSvs(object));
    }
    /*装箱打印查询*/
    @ApiOperation("库存装箱打印内容查询接口")
    @SaCheckPermission("createProductStock.search")
    @PostMapping("/getInventoryPrints")
    public Result getInventoryPrints( @RequestBody List<FinishedGoodsInventory> finishedGoodsInventories){
        return Result.seccess(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
        return Result.success(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
    }

    @ApiOperation("成品装箱调架")
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/changeRack/{user}")
    public Result changeRack( @RequestBody FinishedGoodsInventory  finishedGoodsInventory,@PathVariable String user){
        return Result.seccess(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));
        return Result.success(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java

@@ -35,7 +35,7 @@
    @PostMapping("/saveMaterialOutbound")
    public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){

        return Result.seccess(materialInventoryService.saveMaterialOutbound(object));
        return Result.success(materialInventoryService.saveMaterialOutbound(object));

    }

@@ -43,7 +43,7 @@
    @SaCheckPermission("selectIngredientsStock.add")
    @PostMapping("/saveMaterialInventory")
    public Result saveMaterialInventory( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.saveMaterialInventory(object));
        return Result.success(materialInventoryService.saveMaterialInventory(object));
    }


@@ -51,42 +51,42 @@
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
        return Result.success(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
    }

    @ApiOperation("物料库存工程加时间查询接口")
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
        return Result.success(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
    }

    @ApiOperation("物料库存查询接口")
    @SaCheckPermission("createOutbound.search")
    @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
        return Result.success(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
    }

    @ApiOperation("物料库存工程查询接口")
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
        return Result.success(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
    }

    @ApiOperation("材料出库加时间查询接口")
    @SaCheckPermission("materialOutbound.search")
    @PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
        return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
        return Result.success(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
    }

    @ApiOperation("材料出库查询接口")
    @SaCheckPermission("createOutbound.search")
    @PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
    public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
        return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
        return Result.success(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
    }


@@ -94,42 +94,42 @@
    @SaCheckPermission("createOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
        return Result.success(materialInventoryService.updateMaterialOutboundToExamine(object));
    }

    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("materialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
        return Result.success(materialInventoryService.deleteMaterialOutbound(object));
    }

    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("returnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
        return Result.success(materialInventoryService.saveReturningWarehouse(object));
    }

    @ApiOperation("物料返库新增查询接口")
    @SaCheckPermission("returnToStorageCreate.search")
    @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
    public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
        return Result.success(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
    }

    @ApiOperation("物料返库删除接口")
    @SaCheckPermission("returnToStorageCreate.delete")
    @PostMapping("/deleteReturnToStorage")
    public Result deleteReturnToStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.deleteReturnToStorage(object));
        return Result.success(materialInventoryService.deleteReturnToStorage(object));
    }

    @ApiOperation("物料返库审核接口")
    @SaCheckPermission("returnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
        return Result.success(materialInventoryService.updateReturningWarehouseToExamine(object));
    }


@@ -137,7 +137,7 @@
    @SaCheckPermission("returnToStorage.search")
    @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
        return Result.success(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
    }


@@ -145,35 +145,35 @@
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
        return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
        return Result.success(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
    }

    @ApiOperation("余料新增接口")
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/addSelectSurplusMaterialsDate")
    public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
        return Result.success(materialInventoryService.addSelectSurplusMaterialsDate(object));
    }

    @ApiOperation("物料出库打印接口")
    @SaCheckPermission("selectIngredientsStock.search")
    @GetMapping ("/printCreateOutbound/{materialOutboundId}")
    public Result printCreateOutbound(@PathVariable String materialOutboundId)  {
        return   Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
        return   Result.success(materialInventoryService.printCreateOutbound(materialOutboundId));
    }

    @ApiOperation("物料库存记录查询接口")
    @SaCheckPermission("warehouseReport.search")
    @PostMapping("/getMaterialLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getMaterialLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
        return Result.seccess(materialInventoryService.getMaterialLogReport(type,pageNum,pageSize,selectDate,materialLog));
        return Result.success(materialInventoryService.getMaterialLogReport(type,pageNum,pageSize,selectDate,materialLog));
    }

    @ApiOperation("物料库存删除")
    @SaCheckPermission("createOutbound.search")
    @PostMapping("/deleteMaterialInventory")
    public Result deleteMaterialInventory(@RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.deleteMaterialInventory(object));
        return Result.success(materialInventoryService.deleteMaterialInventory(object));
    }

    @ApiOperation("物料报表导出")
@@ -187,26 +187,26 @@
    @ApiOperation("mes切割报工")
    @PostMapping  ("/mesMaterialOutbound")
    public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
        return  Result.success(materialInventoryService.mesMaterialOutbound(reportingWork));
    }

    @ApiOperation("mes原片查询")
    @PostMapping  ("/mesOriginalSelect")
    public Result mesOriginalSelect()  {
        return  Result.seccess(materialInventoryService.mesOriginalSelect());
        return  Result.success(materialInventoryService.mesOriginalSelect());
    }

    @ApiOperation("物料新增返回接口")
    @PostMapping("/cancelMaterialAdditionRecord")
    public Result cancelMaterialAdditionRecord( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.cancelMaterialAdditionRecord(object));
        return Result.success(materialInventoryService.cancelMaterialAdditionRecord(object));
    }

    @ApiOperation("优化物料库存记录查询接口")
    @SaCheckPermission("warehouseReport.search")
    @PostMapping("/getOptimizeOutboundReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getOptimizeOutboundReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
        return Result.seccess(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
        return Result.success(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
    }

    @ApiOperation("物料出库保存并审核接口")
@@ -214,7 +214,7 @@
    @PostMapping("/saveToExamineMaterialOutbound")
    public Result saveToExamineMaterialOutbound( @RequestBody Map<String,Object>  object){

        return Result.seccess(materialInventoryService.saveToExamineMaterialOutbound(object));
        return Result.success(materialInventoryService.saveToExamineMaterialOutbound(object));

    }

@@ -222,7 +222,7 @@
    @SaCheckPermission("selectIngredientsStock.add")
    @PostMapping("/updateMaterialInventory")
    public Result updateMaterialInventory( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.updateMaterialInventory(object));
        return Result.success(materialInventoryService.updateMaterialInventory(object));
    }



 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java

@@ -25,35 +25,35 @@
    @SaCheckPermission("createIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.saveMaterialStore(object));
        return Result.success(materialStoreService.saveMaterialStore(object));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
    public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
        return Result.success(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
    }

    @ApiOperation("产品Bom物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectProductBOM/{pageNum}/{pageSize}")
    public Result getSelectProductBOM(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
        return Result.success(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("selectIngredients.search")
    @PostMapping("/getSelectMaterialStore")
    public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectMaterialStores(materialStore));
        return Result.success(materialStoreService.getSelectMaterialStores(materialStore));
    }

    @ApiOperation("物料删除接口")
    @SaCheckPermission("selectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.deleteMaterialStore(object));
        return Result.success(materialStoreService.deleteMaterialStore(object));
    }



 north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java

@@ -24,21 +24,21 @@
    @ApiOperation("查询工序接口")
    @PostMapping  ("/selectProcess")
    public Result selectProcess()  {
        return  Result.seccess(basicDateProduceService.selectProcessSv());
        return  Result.success(basicDateProduceService.selectProcessSv());
    }

    @ApiOperation("查询所有基础数据接口")
    @SaCheckPermission("selectProductionBasicData.search")
    @PostMapping  ("/selectBasic")
    public Result selectBasic()  {
        return  Result.seccess(basicDateProduceService.selectBasicSv());
        return  Result.success(basicDateProduceService.selectBasicSv());
    }

    @ApiOperation("根据Id查询对应基础数据接口")
    @PostMapping  ("/openSelectId/{id}")
    public Result openSelectId(
            @PathVariable String id){
        return Result.seccess(basicDateProduceService.openSelectIdSv(id));
        return Result.success(basicDateProduceService.openSelectIdSv(id));

    }

@@ -47,7 +47,7 @@
    @PostMapping("/deleteBasic/{id}")
    public Result deleteBasic(@PathVariable String id){
        if(basicDateProduceService.deleteBasicSv(id)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败！");

@@ -61,7 +61,7 @@
                              @PathVariable String name,
                              @PathVariable String type){
        if(basicDateProduceService.updateBasicSv(id,process,name,type)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"修改失败");

@@ -73,7 +73,7 @@
    @PostMapping("/saveTeamGroup")
    public Result saveTeamGroup( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveTeamGroupSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -85,7 +85,7 @@
    @PostMapping("/saveBreakageType")
    public Result saveBreakageType( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveBreakageTypeSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -97,7 +97,7 @@
    @PostMapping("/saveBreakageReason")
    public Result saveBreakageReason( @RequestBody Map<String,Object> object){
        if(basicDateProduceService.saveBreakageReasonSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");


 north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java

@@ -26,7 +26,7 @@
    @PostMapping("/saveMachine")
    public Result saveTeamGroup( @RequestBody Map<String,Object> object){
        if(deviceMaintenanceService.saveMachineSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -35,7 +35,7 @@
    @ApiOperation("查询下拉框数据接口")
    @PostMapping  ("/selectData")
    public Result selectData()  {
        return  Result.seccess(deviceMaintenanceService.selectDataSv());
        return  Result.success(deviceMaintenanceService.selectDataSv());
    }

    @ApiOperation("保养维修新增接口")
@@ -43,7 +43,7 @@
    @PostMapping("/saveMaintenanceAndRepair")
    public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
        if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -56,7 +56,7 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2
    )  {
        return  Result.seccess(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
        return  Result.success(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
    }


@@ -65,7 +65,7 @@
    @PostMapping("/deleteMaintenance/{id}")
    public Result deleteMaintenance(@PathVariable String id){
        if(deviceMaintenanceService.deleteMaintenanceSv(id)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败！");

@@ -76,14 +76,14 @@
    @SaCheckPermission("selectMachine.search")
    @PostMapping  ("/selectMachine")
    public Result selectMachine()  {
        return  Result.seccess(deviceMaintenanceService.selectMachineSv());
        return  Result.success(deviceMaintenanceService.selectMachineSv());
    }

    @ApiOperation("根据Id查询对应数据接口")
    @PostMapping  ("/openSelectId/{id}")
    public Result openSelectId(
            @PathVariable String id){
        return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));
        return Result.success(deviceMaintenanceService.openSelectIdSv(id));

    }

@@ -92,6 +92,6 @@
    public Result deleteOrderWork(
            @RequestBody Map<String,Object> object
    ){
        return  Result.seccess(deviceMaintenanceService.updateMaintenance(object));
        return  Result.success(deviceMaintenanceService.updateMaintenance(object));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java

@@ -39,7 +39,7 @@
    @PostMapping  ("/projectInfo/{projectNo}/{username}")
    public Result projectInfo(
            @PathVariable String projectNo,@PathVariable String username){
        return Result.seccess(glassOptimizeService.projectInfoSv(projectNo,username));
        return Result.success(glassOptimizeService.projectInfoSv(projectNo,username));
    }


@@ -47,7 +47,7 @@
    @ApiOperation("优化传入信息接口")
    @PostMapping  ("/optimizeInfo/{projectNo}/{username}")
    public Result optimizeInfo(@PathVariable String projectNo,@PathVariable String username){
        return Result.seccess(glassOptimizeService.optimizeInfoSv(projectNo,username));
        return Result.success(glassOptimizeService.optimizeInfoSv(projectNo,username));
    }

    //工程信息流程卡
@@ -55,7 +55,7 @@
    @PostMapping  ("/getProcessCard/{projectNo}")
    public Result getProcessCard(
            @PathVariable String projectNo){
        return Result.seccess(glassOptimizeService.getProcessCardSv(projectNo));
        return Result.success(glassOptimizeService.getProcessCardSv(projectNo));
    }

    //库存信息
@@ -65,7 +65,7 @@
            @PathVariable  String thickness,
            @PathVariable  String model,@PathVariable  String projectNumber,
            @RequestParam(name = "type", required = false) Integer type,@RequestParam(name = "username", required = false) String username  ){
        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
        return Result.success(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
    }


@@ -75,7 +75,7 @@
    public Result getFlowCardList(
            @PathVariable String optionVal,
            @PathVariable Integer radio){
        return Result.seccess(glassOptimizeService.getFlowCardList(optionVal,radio));
        return Result.success(glassOptimizeService.getFlowCardList(optionVal,radio));
    }

    //工程查询流程卡
@@ -84,14 +84,14 @@
    public Result getUpdateFlowCardList(
            @PathVariable String type,@PathVariable String thickness,
            @PathVariable Integer radio,@PathVariable String projectNo){
        return Result.seccess(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
        return Result.success(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
    }

    //工程查询流程卡
    @ApiOperation("工程查询流程卡")
    @PostMapping  ("/getProjectList")
    public Result getProjectList(){
        return Result.seccess(glassOptimizeService.getProjectListSv());
        return Result.success(glassOptimizeService.getProjectListSv());
    }

    @ApiOperation("根据工程卡号工程查询流程卡")
@@ -99,7 +99,7 @@
    public Result getProjectByProjectNo(
            @PathVariable String projectNo
    ){
        return Result.seccess(glassOptimizeService.getProjectByProjectNoSv(projectNo));
        return Result.success(glassOptimizeService.getProjectByProjectNoSv(projectNo));
    }


@@ -111,7 +111,7 @@
            @PathVariable Date startSelectTime,
            @PathVariable Date endSelectTime,
            @RequestBody OptimizeProjectMange optimizeProjectMange) {
        return Result.seccess(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
        return Result.success(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
    }

    //修改工程状态
@@ -124,7 +124,7 @@
            @PathVariable Integer code
    ) throws JsonProcessingException {
        if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
            return Result.seccess();
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "修改失败");

@@ -136,7 +136,7 @@
    @PostMapping("/deleteProject/{projectNumber}")
    public Result deleteProject(
            @PathVariable String projectNumber){
        return Result.seccess(glassOptimizeService.deleteProject(projectNumber,1));
        return Result.success(glassOptimizeService.deleteProject(projectNumber,1));
    }

    //模拟计算工程号查询
@@ -144,7 +144,7 @@
    @PostMapping  ("/selectProjectCompute/{projectNumber}")
    public Result selectProjectCompute(
            @PathVariable String projectNumber){
        return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
        return Result.success(glassOptimizeService.selectProjectComputeSv(projectNumber));
    }

    //模拟计算工程号查询
@@ -152,7 +152,7 @@
    @PostMapping  ("/selectProjectComputeAll/{projectNumber}")
    public Result selectProjectComputeAll(
            @PathVariable String projectNumber){
        return Result.seccess(glassOptimizeService.selectProjectComputeAll(projectNumber));
        return Result.success(glassOptimizeService.selectProjectComputeAll(projectNumber));
    }

    //模拟计算流程卡详情
@@ -160,14 +160,14 @@
    @PostMapping  ("/selectComputeDetail/{processId}/{technologyNumber}/{patchState}")
    public Result selectComputeDetail(
            @PathVariable String processId, @PathVariable Integer technologyNumber,@PathVariable String patchState){
        return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
        return Result.success(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
    }

    @ApiOperation("模拟计算")
    @PostMapping("/simulationCalculate")
    public Result simulationCalculate(@RequestBody Map<String, Object> object) {
        try {
            return Result.seccess(glassOptimizeService.SimulationCalculation(object));
            return Result.success(glassOptimizeService.SimulationCalculation(object));
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error();
@@ -179,7 +179,7 @@
    public Result simulationSave(@RequestBody Map<String, Object> object) {
        System.out.println("接收到的模拟计算保存数据: " + object);
        try {
            return Result.seccess(glassOptimizeService.addSimulation(object));
            return Result.success(glassOptimizeService.addSimulation(object));
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error();
@@ -190,7 +190,7 @@
    @PostMapping("/optimizeParms/{username}")
    public Result optimizeParmsSave(@RequestBody Map<String, Object> object,@PathVariable String username) {
        try {
            return Result.seccess(glassOptimizeService.optimizeParmsSave(object,username));
            return Result.success(glassOptimizeService.optimizeParmsSave(object,username));
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error();
@@ -200,7 +200,7 @@

    @PostMapping("/selectOptimizeParms/{username}")
    public Result getOptimizeParms(@PathVariable String username) {
        return Result.seccess(userService.getOptimizeParms(username));
        return Result.success(userService.getOptimizeParms(username));
    }


@@ -209,7 +209,7 @@
    @PostMapping("/selectComputeDetailmore")
    public Result selectComputeDetailmore(@RequestBody Map<String, Object> object) {
        try {
            return Result.seccess(glassOptimizeService.SimulationCalculation(object));
            return Result.success(glassOptimizeService.SimulationCalculation(object));
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error();
@@ -226,19 +226,19 @@
    public Result getProcessCardDetail(
            @PathVariable String processId,
            @PathVariable Integer technologyNumber){
        return Result.seccess(glassOptimizeService.getProcessCardDetailSv(processId,technologyNumber));
        return Result.success(glassOptimizeService.getProcessCardDetailSv(processId,technologyNumber));
    }

    @ApiOperation("膜系查询")
    @PostMapping  ("/selectGlassType")
    public Result selectGlassType(){
        return Result.seccess(glassOptimizeService.selectGlassTypeSv());
        return Result.success(glassOptimizeService.selectGlassTypeSv());
    }

    @ApiOperation("最新工程号查询")
    @PostMapping  ("/getProjectId")
    public Result getProjectId(){
        return Result.seccess(glassOptimizeService.getProjectIdSv());
        return Result.success(glassOptimizeService.getProjectIdSv());
    }
    @ApiOperation("创建工程接口")
    @PostMapping("/addProject/{optionVal}/{projectId}/{projectNmae}")
@@ -247,7 +247,7 @@
            @PathVariable String projectId,
            @PathVariable String projectNmae,
            @RequestBody Map<String,Object> object){
        return  Result.seccess(glassOptimizeService.addProjectSv(optionVal,projectId,projectNmae,object));
        return  Result.success(glassOptimizeService.addProjectSv(optionVal,projectId,projectNmae,object));
    }


@@ -255,20 +255,20 @@
    @PostMapping("/saveOptimizeData/{projectId}")
    public Result saveOptimizeResult( @PathVariable String projectId,
            @RequestBody Map<String,Object> object){
        return  Result.seccess(glassOptimizeService.saveOptimizeResult(object,projectId));
        return  Result.success(glassOptimizeService.saveOptimizeResult(object,projectId));
    }

    @ApiOperation("查询报告数据接口")
    @PostMapping("/getReportData/{processId}")
    public Result getReportData(@PathVariable String processId){
        return  Result.seccess(glassOptimizeService.getReportDataSv(processId));
        return  Result.success(glassOptimizeService.getReportDataSv(processId));
    }

    @ApiOperation("查询物料信息接口")
    @PostMapping("/materialInfo/{processId}")
    public Result materialInfo(
            @PathVariable String processId){
        return  Result.seccess(glassOptimizeService.getMaterialInfoSv(processId));
        return  Result.success(glassOptimizeService.getMaterialInfoSv(processId));
    }


@@ -276,21 +276,21 @@
    @PostMapping("/getProductList/{processId}")
    public Result getProductList(
            @PathVariable String processId){
        return  Result.seccess(glassOptimizeService.getProductListSv(processId));
        return  Result.success(glassOptimizeService.getProductListSv(processId));
    }

    @ApiOperation("查询优化结果接口")
    @PostMapping("/selectOptimizeResult/{processId}")
    public Result selectOptimizeResult(
            @PathVariable String processId){
        return  Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
        return  Result.success(glassOptimizeService.selectOptimizeResult(processId));
    }

    @ApiOperation("查询优化结果信息接口")
    @PostMapping("/getOptimizeInfo/{processId}")
    public Result getOptimizeInfo(
            @PathVariable String processId){
        return  Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
        return  Result.success(glassOptimizeService.getOptimizeInfoSv(processId));
    }

    @ApiOperation("更新优化结果接口")
@@ -298,7 +298,7 @@
    public Result updateOptimizeResult(
            @PathVariable String processId,@RequestBody Map<String,Object> object){

        return  Result.seccess(glassOptimizeService.updateOptimizeResult(object,processId));
        return  Result.success(glassOptimizeService.updateOptimizeResult(object,processId));
    }
    @ApiOperation("OPT文件下载接口")
    @PostMapping("/generateOpt")
@@ -322,19 +322,19 @@

    @PostMapping("/getConfiguration/{type}/{username}")
    public Result getConfiguration(@PathVariable String type,@PathVariable String username) {
        return Result.seccess(glassOptimizeService.getConfiguration(type,username));
        return Result.success(glassOptimizeService.getConfiguration(type,username));
    }

    @ApiOperation("修片磨量修改")
    @PostMapping("/saveConfiguration/{type}/{username}")
    public Result saveConfiguration(@PathVariable String type,@PathVariable String username, @RequestBody Map<String,Object>  object){
        return Result.seccess(glassOptimizeService.saveConfiguration(object,type,username));
        return Result.success(glassOptimizeService.saveConfiguration(object,type,username));
    }

    @ApiOperation("模拟排版")
    @PostMapping("/simulatedTypesetting")
    public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
        return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
        return Result.success(glassOptimizeService.simulatedTypesetting1(object));
    }


@@ -425,7 +425,7 @@
    @ApiOperation("模拟计算工程号查询")
    @PostMapping  ("/selectProjectComputeMpThirdParty/{projectNumber}")
    public Result selectProjectComputeMpThirdParty( @PathVariable String projectNumber){
        return Result.seccess(glassOptimizeService.selectProjectComputeMpThirdParty(projectNumber));
        return Result.success(glassOptimizeService.selectProjectComputeMpThirdParty(projectNumber));
    }

    //模拟计算流程卡详情第三方
@@ -433,14 +433,14 @@
    @PostMapping  ("/selectComputeDetailThirdParty/{processId}/{technologyNumber}")
    public Result selectComputeDetailThirdParty(
            @PathVariable String processId, @PathVariable Integer technologyNumber){
        return Result.seccess(glassOptimizeService.selectComputeDetailThirdParty(processId,technologyNumber));
        return Result.success(glassOptimizeService.selectComputeDetailThirdParty(processId,technologyNumber));
    }

    @ApiOperation("模拟计算保存")
    @PostMapping("/simulationSaveThirdParty")
    public Result simulationSaveThirdParty(@RequestBody Map<String, Object> object) {
        try {
            return Result.seccess(glassOptimizeService.simulationSaveThirdParty(object));
            return Result.success(glassOptimizeService.simulationSaveThirdParty(object));
        } catch (Exception e) {
            e.printStackTrace();
            return Result.error();
@@ -452,21 +452,21 @@
    @PostMapping("/deleteProjectThirdParty/{projectNumber}")
    public Result deleteProjectThirdParty(
            @PathVariable String projectNumber){
        return Result.seccess(glassOptimizeService.deleteProjectThirdParty(projectNumber));
        return Result.success(glassOptimizeService.deleteProjectThirdParty(projectNumber));
    }

    @ApiOperation("工程信息接口")
    @PostMapping  ("/projectInfoThirdParty/{projectNo}")
    public Result projectInfoThirdParty(
            @PathVariable String projectNo){
        return Result.seccess(glassOptimizeService.projectInfoThirdParty(projectNo));
        return Result.success(glassOptimizeService.projectInfoThirdParty(projectNo));
    }

    //库存信息
    @ApiOperation("库存信息接口")
    @GetMapping  ("/materialStoreSvThirdParty/{projectNumber}")
    public Result materialStoreSvThirdParty(@PathVariable  String projectNumber ){
        return Result.seccess(glassOptimizeService.materialStoreSvThirdParty(projectNumber));
        return Result.success(glassOptimizeService.materialStoreSvThirdParty(projectNumber));
    }

    //工程信息流程卡
@@ -474,13 +474,13 @@
    @PostMapping  ("/getProcessCardMpThirdParty/{projectNo}")
    public Result getProcessCardMpThirdParty(
            @PathVariable String projectNo){
        return Result.seccess(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
        return Result.success(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
    }

    @ApiOperation("mes工程任务下发接口")
    @PostMapping("/getIssuingProjects")
    public Result issuingProjects(@RequestBody String projectNo) throws JsonProcessingException {
        return Result.seccess(glassOptimizeService.issuingProjects(projectNo));
        return Result.success(glassOptimizeService.issuingProjects(projectNo));
    }



 north-glass-erp/src/main/java/com/example/erp/controller/pp/OtherSystemInfoController.java

@@ -21,6 +21,6 @@

    @PostMapping("/getGlassInfo")
    public Result  getGlassInfo(@Valid @RequestBody OptimizeProject glassInfo) {
        return Result.seccess(otherSystemInfoService.saveGlassInfo(glassInfo));
        return Result.success(otherSystemInfoService.saveGlassInfo(glassInfo));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -40,7 +40,7 @@
            @PathVariable Integer pageSize,
            @PathVariable List<String> selectDate,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
        return Result.success(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));

    }

@@ -51,7 +51,7 @@
    public Result selectAddProcess(
            @PathVariable List<String> selectDate,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectAddProcess(selectDate, flowCard));
        return Result.success(flowCardService.selectAddProcess(selectDate, flowCard));
    }

    //分架明细查询
@@ -61,7 +61,7 @@
    public Result detailsSelect(
            @PathVariable String orderId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.detailsSelectSv(orderId, flowCard));
        return Result.success(flowCardService.detailsSelectSv(orderId, flowCard));

    }

@@ -77,12 +77,12 @@
            @PathVariable String userName
    ) {
//        if(flowCardService.deleteFlowCardSv(orderId,processId)){
//            return Result.seccess();
//            return Result.success();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败,请检查是否已报工");
//
//        }
        return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
        return Result.success(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
    }

    //修改排版状态
@@ -94,7 +94,7 @@
            @PathVariable Integer state
    ) {
        if (flowCardService.updateLayoutStatusSv(processId, state)) {
            return Result.seccess();
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "修改失败");

@@ -108,7 +108,7 @@
            @PathVariable String orderId,
            @PathVariable String productionId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
        return Result.success(flowCardService.selectNoCardSv(orderId, productionId, flowCard));

    }

@@ -120,7 +120,7 @@
            @PathVariable String flashback,
            @PathVariable String optionVal,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));
        return Result.success(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));

    }

@@ -130,7 +130,7 @@
    @PostMapping("/addFlowCard/{orderId}")
    public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
        if (flowCardService.addFlowCardSv(orderId,object)) {
            return Result.seccess();
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "保存失败");

@@ -144,7 +144,7 @@
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));
        return Result.success(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));

    }

@@ -158,7 +158,7 @@
            @PathVariable String processes,
            @PathVariable Integer state,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));
        return Result.success(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));

    }

@@ -169,7 +169,7 @@
    public Result flowCardDetail(
            @PathVariable String processId,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.flowCardDetailSv(processId, flowCard));
        return Result.success(flowCardService.flowCardDetailSv(processId, flowCard));

    }

@@ -183,7 +183,7 @@
            @PathVariable String userId,
            @PathVariable Integer state,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
        return Result.success(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
    }

    @ApiOperation("流程卡明细查询接口")
@@ -192,7 +192,7 @@
    public Result selectPrint(
            @PathVariable String inquiryMode,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
        return Result.success(flowCardService.selectPrintSv(object,inquiryMode));

    }

@@ -206,32 +206,32 @@
            @PathVariable String compound,
            @PathVariable String landingSequence,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
        return Result.success(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
    }

    @ApiOperation("工程打印流程卡数据查询接口")
    @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")
    public Result getSelectPrintProject(
            @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {
        return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
        return Result.success(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
    }

    @ApiOperation("打印标签数据查询接口")
    @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
    public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
        return Result.success(flowCardService.getSelectPrintLabelSv(projectNo,type));
    }

    @ApiOperation("打印标签查询接口")
    @PostMapping("/getSelectPrintLabel1")
    public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
        return Result.success(flowCardService.getSelectPrintLabelSv1(object));
    }

    @ApiOperation("打印标签明细查询接口")
    @PostMapping("/getSelectPrintLabelDetails")
    public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
        return Result.success(flowCardService.getSelectPrintLabelDetails(object));
    }

    @ApiOperation("打印自定义标签数据查询接口明细")
@@ -239,7 +239,7 @@
    public Result getSelectPrintCustomLabel( @PathVariable String type,
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
        return Result.success(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));

    }

@@ -248,7 +248,7 @@
    public Result getSelectPrintCustomLabel2( @PathVariable String type,
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
        return Result.success(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));

    }

@@ -259,7 +259,7 @@
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.updateComposingSv(object));
        return Result.success(flowCardService.updateComposingSv(object));
    }

    @ApiOperation("复选框撤销可排版状态")
@@ -269,7 +269,7 @@
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.revokeComposingSv(object));
        return Result.success(flowCardService.revokeComposingSv(object));
    }
    @ApiOperation("流程卡打印明细数据排序查询接口")
    @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
@@ -277,14 +277,14 @@
                                       @PathVariable String technologyNumber,
                                       @PathVariable String process,
                                       @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
        return Result.success(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
    }

    @ApiOperation("保存打印排序接口")
    @PostMapping("/printSort")
    public Result printSort(@RequestBody Map<String, Object> object) {
        if (flowCardService.printSortSv(object)) {
            return Result.seccess();
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "保存失败");

@@ -298,7 +298,7 @@
            @PathVariable String form,
            @PathVariable String id,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
        return Result.success(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));

    }

@@ -307,7 +307,7 @@
    @PostMapping("/selectPrintPrintProject/{selectDate}")
    public Result selectPrintFlowCard(
            @PathVariable List<String> selectDate) {
        return Result.seccess(flowCardService.selectPrintFlowCard(selectDate));
        return Result.success(flowCardService.selectPrintFlowCard(selectDate));
    }

    @ApiOperation("修改是否打印状态")
@@ -317,21 +317,21 @@
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
        return Result.success(flowCardService.updatePrintStateSv(printState,object));
    }

    @ApiOperation("流程卡打印订单数据排序查询接口")
    @PostMapping("/printFlowCardOrderSort/{orderId}")
    public Result printFlowCardOrderSort(@PathVariable String orderId,
                                       @RequestBody FlowCard flowCard) {
        return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
        return Result.success(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
    }

    @ApiOperation("保存打印订单排序接口")
    @PostMapping("/printOrderSort")
    public Result printOrderSort(@RequestBody Map<String, Object> object) {
        if (flowCardService.printOrderSort(object)) {
            return Result.seccess();
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "保存失败");

@@ -345,7 +345,7 @@
            @PathVariable String printLike,
            @PathVariable String mergeTechnologyNumber,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
        return Result.success(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
    }

    @ApiOperation("合并打印流程卡补片数据查询接口")
@@ -355,7 +355,7 @@
            @PathVariable String printLike,
            @PathVariable String mergeTechnologyNumber,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
        return Result.success(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
    }

    @ApiOperation("打印流程卡返工数据查询接口")
@@ -364,7 +364,7 @@
            @PathVariable String printMerge,
            @PathVariable String printLike,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
        return Result.success(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
    }

    @ApiOperation("流程卡明细按编号查询接口")
@@ -373,7 +373,7 @@
            @PathVariable String inquiryMode,
            @PathVariable Integer type,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
        return Result.success(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));

    }

@@ -382,7 +382,7 @@
    public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
        return Result.success(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));

    }

@@ -390,7 +390,7 @@
    @PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
    public Result getPrintCustomDataProjectNo( @PathVariable String type,
                                                    @PathVariable String projectNo) {
        return Result.seccess(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
        return Result.success(flowCardService.getPrintCustomDataProjectNo(type,projectNo));

    }

@@ -398,25 +398,25 @@
    @PostMapping("/selectSortTable")
    public Result selectSortTable(
                                  @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.selectSortTableSv(object));
        return Result.success(flowCardService.selectSortTableSv(object));
    }

    @ApiOperation("合并流程卡接口")
    @PostMapping("/mergeFlowCard/{merge}")
    public Result mergeFlowCard(@RequestBody Map<String, Object> object,
                                @PathVariable Integer merge) {
        return Result.seccess(flowCardService.mergeFlowCard(object,merge));
        return Result.success(flowCardService.mergeFlowCard(object,merge));
    }
    @ApiOperation("汉玻获取流程卡接口")
    @PostMapping("/getProcessCardList/hanbo")
    public Result getProcessCard(@RequestBody Map<String,String> processCards)  {
        return Result.seccess(flowCardService.getProcessCard(processCards));
        return Result.success(flowCardService.getProcessCard(processCards));
    }

    @ApiOperation("获取流程卡接口")
    @PostMapping("/getProcessCardList/all")
    public Result getProcessCardAll(@RequestBody Map<String,String> processCards)  {
        return Result.seccess(flowCardService.getProcessCardAll(processCards));
        return Result.success(flowCardService.getProcessCardAll(processCards));
    }

    @ApiOperation("复选框删除流程卡")
@@ -426,14 +426,14 @@
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.checkboxDeleteSv(object));
        return Result.success(flowCardService.checkboxDeleteSv(object));
    }

    @ApiOperation("工程明细打印查询")
    @PostMapping("/selectPrintProjectDetails/{projectNo}")
    public Result selectPrintProjectDetails(
                                               @PathVariable String projectNo) {
        return Result.seccess(flowCardService.getPrintProjectDetails(projectNo));
        return Result.success(flowCardService.getPrintProjectDetails(projectNo));

    }
    @ApiOperation("工程明细打印标签查询")
@@ -442,7 +442,7 @@
            @PathVariable String type,
            @PathVariable Integer detailType,
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
        return Result.success(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));

    }

@@ -457,39 +457,39 @@
            @RequestBody Map<String, Object> object
    ) {

        return Result.seccess(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
        return Result.success(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
    public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
        return Result.success(flowCardService.updateProjectLabelPrintCount(projectNo));
    }

    @ApiOperation("工程打印标签次数修改")
    @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
    public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
        return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
        return Result.success(flowCardService.updateProjectProcessPrintCount(projectNo));
    }

    @ApiOperation("流程卡合架")
    @PostMapping("/flowCardDetail")
    public Result flowCardDetail(
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.flowCardDetail(object));
        return Result.success(flowCardService.flowCardDetail(object));
    }

    @ApiOperation("保存流程卡合架")
    @PostMapping("/updateProcessCardRack")
    public Result updateProcessCardRack(
            @RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.updateProcessCardRack(object));
        return Result.success(flowCardService.updateProcessCardRack(object));
    }

    @ApiOperation("智能分架")
    @PostMapping("/processCardAutoRack")
    public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
        return Result.seccess(flowCardService.processCardAutoRack(object));
        return Result.success(flowCardService.processCardAutoRack(object));
    }

    @ApiOperation("流程卡查询导出")
@@ -509,7 +509,7 @@
            @PathVariable Integer value
    ) {

        return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));
        return Result.success(flowCardService.updateTerminationSv(processId,orderNumber,value));
    }

    @ApiOperation("查询用于修改生产终止数量的完工数量")
@@ -518,7 +518,7 @@
            @PathVariable String processId,
            @PathVariable Integer orderNumber,
            @PathVariable String process) {
        return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));
        return Result.success(flowCardService.selectCompletedSv(processId, orderNumber,process));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java

@@ -31,7 +31,7 @@
            @PathVariable String processes,
            @PathVariable String orderId,
            @RequestBody ProductionScheduling productionScheduling){
        return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
        return Result.success(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));

    }
    //点击查询排版数据
@@ -48,7 +48,7 @@
            @PathVariable Integer state,
            @RequestBody ProductionScheduling productionScheduling){

        return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
        return Result.success(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));

    }

@@ -61,7 +61,7 @@
    public Result addScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.addSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");

@@ -75,7 +75,7 @@
    public Result deleteScheduling( @RequestBody Map<String,Object>  object) throws Exception{

        if(productionSchedulingService.deleteSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"删除失败");

@@ -88,7 +88,7 @@
    public Result examineScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.examineSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");

@@ -101,7 +101,7 @@
    public Result cancelReviewScheduling( @RequestBody Map<String,Object>  object){

        if(productionSchedulingService.cancelReviewSchedulingSv(object)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"反审失败");


 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java

@@ -35,14 +35,14 @@
    @SaCheckPermission("addReplenish.search")
    @PostMapping("/getSelectReplenish/{pageNum}/{pageSize}")
    public Result getSelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@RequestBody PatchLogAddDTO patchLogAddDTO){
        return Result.seccess(replenishService.getSelectReplenish(pageNum,pageSize,patchLogAddDTO));
        return Result.success(replenishService.getSelectReplenish(pageNum,pageSize,patchLogAddDTO));
    }

    @ApiOperation("补片查询接口")
    @SaCheckPermission("selectReplenish.search")
    @PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLogDTO patchLogDTO){
        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
        return Result.success(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
    }


@@ -50,14 +50,14 @@
    @SaCheckPermission("addReplenish.add")
    @PostMapping("/saveReplenish")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        return Result.seccess(replenishService.saveReplenish(object));
        return Result.success(replenishService.saveReplenish(object));
    }

    @ApiOperation("补片审核接口")
    @SaCheckPermission("selectReplenish.review")
    @PostMapping("/updateReplenish")
    public Result updateReplenish( @RequestBody Map<String,Object> object){
        return Result.seccess(replenishService.updateReplenish(object));
        return Result.success(replenishService.updateReplenish(object));
    }

    @ApiOperation("补片流程卡明细查询接口")
@@ -67,7 +67,7 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
        return Result.success(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));

    }

@@ -76,7 +76,7 @@
    public Result getSelectPrintCustomLabel( @PathVariable String type,
                                             @PathVariable Integer lableType,
                                             @RequestBody Map<String, Object> object) {
        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
        return Result.success(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));

    }

@@ -84,13 +84,13 @@
    @SaCheckPermission("selectReplenish.delete")
    @PostMapping("/deleteReplenish")
    public Result deleteReplenish( @RequestBody Map<String,Object> object){
        return Result.seccess(replenishService.deleteReplenishSv(object));
        return Result.success(replenishService.deleteReplenishSv(object));
    }

    @ApiOperation("补片反审接口")
    @SaCheckPermission("selectReplenish.countertrial")
    @PostMapping("/updateCancelReview")
    public Result updateCancelReview( @RequestBody Map<String,Object> object){
        return Result.seccess(replenishService.updateCancelReviewSv(object));
        return Result.success(replenishService.updateCancelReviewSv(object));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java

@@ -32,18 +32,18 @@
    @ApiOperation("订单流程卡进度")
    @PostMapping("/processCardProgress/{orderId}")
    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressSv(orderId, columns));
        return Result.success(reportService.processCardProgressSv(orderId, columns));
    }
    @ApiOperation("报表流程卡进度")
    @PostMapping("/processCardProgressReport/{orderId}")
    public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressReportSv(orderId, columns));
        return Result.success(reportService.processCardProgressReportSv(orderId, columns));
    }
    @ApiOperation("流程卡进度汇总")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/processCardProgressCollect/{orderId}")
    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
        return Result.success(reportService.processCardProgressCollectSv(orderId, columns));
    }

    @ApiOperation("跨工序次破")
@@ -52,7 +52,17 @@
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
        return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));

    }

    @ApiOperation("非跨工序次破")
    @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));

    }

@@ -66,7 +76,7 @@
            @PathVariable String selectProcesses,
            @PathVariable String optionVal,
            @RequestBody WorkInProgressDTO workInProgressDTO) {
        return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
        return Result.success(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));

    }

@@ -79,7 +89,7 @@
            @PathVariable String inputProject,
            @PathVariable String selectProcesses,
            @RequestBody Report report) {
        return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
        return Result.success(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));

    }

@@ -92,7 +102,7 @@
            @PathVariable String inputProject,
            @PathVariable String selectProcesses,
            @RequestBody Report report) {
        return Result.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
        return Result.success(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));

    }

@@ -104,7 +114,7 @@
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @RequestBody DamageReportDTO damageReportDTO) {
        return Result.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));

    }

@@ -113,7 +123,7 @@
    public Result splittingDetailsOutside(
            @PathVariable String orderId,
            @RequestBody Report report) {
        return Result.seccess(reportService.splittingDetailsOutsideSv(orderId, report));
        return Result.success(reportService.splittingDetailsOutsideSv(orderId, report));

    }

@@ -123,7 +133,7 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody Report report) {
        return Result.seccess(reportService.qualityReportSv(selectTime1, selectTime2, report));
        return Result.success(reportService.qualityReportSv(selectTime1, selectTime2, report));

    }

@@ -134,7 +144,7 @@
            @PathVariable String selectTime2,
            @PathVariable String selectProcesses,
            @RequestBody Report report) {
        return Result.seccess(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
        return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));

    }

@@ -144,14 +154,14 @@
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @RequestBody Report report) {
        return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
        return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, report));

    }

    @ApiOperation("生产发货进度")
    @PostMapping("/productionSchedule/{orderId}")
    public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
        return Result.seccess(reportService.productionScheduleSv(orderId, columns));
        return Result.success(reportService.productionScheduleSv(orderId, columns));
    }

    @ApiOperation("任务完成情况汇总进度")
@@ -160,7 +170,7 @@
                                       @PathVariable Date selectTime2,
                                       @PathVariable String orderId,
                                       @RequestBody List<Integer> columns) {
        return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
        return Result.success(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
    }

    @ApiOperation("订单计划分解")
@@ -168,7 +178,7 @@
    public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
                                         @RequestBody Report report) {
        return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
        return Result.success(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
    }

    @ApiOperation("订单报工")
@@ -176,7 +186,7 @@
    public Result orderReportingWorks(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
                                         @RequestBody Report report) {
        return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
        return Result.success(reportService.orderReportingWorks(selectTime1, selectTime2, report));
    }

    @ApiOperation("原片领料")
@@ -184,7 +194,7 @@
    public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
                                         @RequestBody Report report) {
        return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
        return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
    }

    @ApiOperation("班组产量明细报表")
@@ -196,7 +206,7 @@
            @PathVariable String selectTime2,
            @PathVariable String selectProcesses,
            @RequestBody TeamOutputDTO teamOutputDTO) {
        return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
        return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));

    }
    @ApiOperation("跨工序次破报表导出")
@@ -204,6 +214,13 @@
    public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportCrossProcessBreakingSv(dates), "CrossProcessBreaking");
    }

    @ApiOperation("非跨工序次破报表导出")
    @PostMapping("/exportNotCrossProcessBreaking")
    public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
    }

    @ApiOperation("次破明细报表导出")
@@ -288,7 +305,7 @@
            @PathVariable Date selectTime2,
            @PathVariable String processes,
            @RequestBody ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
        return Result.seccess(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
        return Result.success(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));

    }

@@ -320,7 +337,7 @@
            @PathVariable String selectProcesses,
            @PathVariable String optionVal,
            @RequestBody WorkInProgressDTO workInProgressDTO) {
        return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
        return Result.success(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));

    }

@@ -334,7 +351,7 @@
            @PathVariable String selectProcesses,
            @PathVariable String optionVal,
            @RequestBody WorkInProgressDTO workInProgressDTO) {
        return Result.seccess(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
        return Result.success(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java

@@ -19,12 +19,12 @@
    public Result queryReworkData(@PathVariable Integer pageNum, @PathVariable Integer pageSize
                                  ,@PathVariable String startTime,@PathVariable String endTime
    ) {
        return Result.seccess(reportWorkService.reworkMangageData(pageNum, pageSize,startTime,endTime));
        return Result.success(reportWorkService.reworkMangageData(pageNum, pageSize,startTime,endTime));
    }

    /*返工新增数据查询*/
    @PostMapping("/rework/add/query/{pageNum}/{pageSize}")
    public Result queryReworkAdd(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReportingWorkDetail reportingWorkDetail) {
        return Result.seccess(reportWorkService.queryRework(pageNum, pageSize,reportingWorkDetail));
        return Result.success(reportWorkService.queryRework(pageNum, pageSize,reportingWorkDetail));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -38,38 +38,38 @@
            @PathVariable String technologyStr,
            @PathVariable String process,
            @PathVariable String reportType)  {
        return  Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
        return  Result.success(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
    }
    @ApiOperation("查询工序")
    @PostMapping  ("/selectProcess/{userId}")
    public Result SelectProcess(@PathVariable String userId)  {
        return  Result.seccess(reportingWorkService.SelectProcessSv(userId));
        return  Result.success(reportingWorkService.SelectProcessSv(userId));
    }

    @ApiOperation("报工新增")
    @SaCheckPermission("addReportingWork.add")
    @PostMapping  ("/saveReportingWork")
    public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
        return  Result.success(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }

    @ApiOperation("报工审核")
    @SaCheckPermission("addReportingWork.review")
    @PostMapping  ("/reviewReportingWork")
    public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork)  {
        return  Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork));
        return  Result.success(reportingWorkService.ReviewReportingWorkSv(reportingWork));
    }

    @ApiOperation("报工修改查询")
    @PostMapping  ("/selectUpdateReportingWork/{reportingWorkId}")
    public Result SelectUpdateReportingWork(@PathVariable String reportingWorkId)  {
        return  Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
        return  Result.success(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
    }
    @ApiOperation("报工修改")
    @SaCheckPermission("addReportingWork.update")
    @PostMapping  ("/updateReportingWork/{reviewState}")
    public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState));
        return  Result.success(reportingWorkService.updateReportingWork(reportingWork,reviewState));
    }

    @ApiOperation("报工查询接口")
@@ -81,7 +81,7 @@
            @PathVariable List<String> selectDate,
            @PathVariable String orderId,
            @RequestBody ReportingWork reportingWork){
        return Result.seccess(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectDate,orderId,reportingWork));
        return Result.success(reportingWorkService.selectReportingWorkSv(pageNum,pageSize,selectDate,orderId,reportingWork));


    }
@@ -95,7 +95,7 @@
                             @PathVariable String userId
            ,@PathVariable String userName){

        return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
        return Result.success(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));

    }

@@ -109,7 +109,7 @@
            @PathVariable Integer state,
            @PathVariable String processId,
            @RequestBody ReportingWork reportingWork){
        return Result.seccess(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectDate,state,processId,reportingWork));
        return Result.success(reportingWorkService.selectQualityTestingSv(pageNum,pageSize,selectDate,state,processId,reportingWork));

    }

@@ -117,7 +117,7 @@
    @SaCheckPermission("qualityInspectionReview.search")
    @PostMapping ("qualityReviewSearch")
    public Result qualityReviewSearch(){
        return Result.seccess(reportingWorkService.qualityReviewSearchSv());
        return Result.success(reportingWorkService.qualityReviewSearchSv());
    }

    @ApiOperation("质检审核审核")
@@ -125,7 +125,7 @@
    @PostMapping  ("/updateQualityStatus/{reportingWorkId}/{username}")
    public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username)  {
        if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){
            return Result.seccess();
            return Result.success();
        }else {
            throw new ServiceException(Constants.Code_500,"审核失败");

@@ -139,7 +139,7 @@
            @PathVariable String processId,
            @PathVariable String thisProcess,
            @RequestBody ReportingWork reportingWork){
        return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
        return Result.success(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));

    }

@@ -147,7 +147,7 @@
    @PostMapping  ("/getPatchCondition/{reportingWorkId}")
    public Result getPatchCondition(
            @PathVariable String reportingWorkId)  {
        return  Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
        return  Result.success(reportingWorkService.getPatchConditionSv(reportingWorkId));
    }

    @ApiOperation("mes报工接口")
@@ -155,7 +155,7 @@
    public Result mesReportingWork(@RequestBody Map<String,Object> reportingWork){
        Boolean aBoolean = reportingWorkService.mesReportingWorkSv(reportingWork);
        if(aBoolean){
            return Result.seccess(aBoolean);
            return Result.success(aBoolean);
        }else{
            throw new ServiceException(Constants.Code_600, "上工序已完工数量小于本工序报工数量，请检查");
        }
@@ -163,42 +163,42 @@
    @ApiOperation("mes报工次破新增")
    @PostMapping  ("/mesSaveReportingWorkWorn")
    public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
        return  Result.success(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }

    @ApiOperation("报工转移")
    @PostMapping  ("/reportingWorkTransfer")
    public Result reportingWorkTransfer(@RequestBody Map<String,String> reportingWork)  {
        return  Result.seccess(reportingWorkService.reportingWorkTransferSv(reportingWork));
        return  Result.success(reportingWorkService.reportingWorkTransferSv(reportingWork));
    }

    @ApiOperation("手机查询当班产量")
    @PostMapping  ("/selectShiftQuantity")
    public Result selectShiftQuantity(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.selectShiftQuantitySv(reportingWork));
        return  Result.success(reportingWorkService.selectShiftQuantitySv(reportingWork));
    }

    @ApiOperation("手机查询本班组报工记录")
    @PostMapping("/selectReportingWorkRecordByPhone")
    public Result selectReportingWorkRecordByPhone(@RequestBody Map<String,Object> selectPam)  {
        return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
        return Result.success(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
    }

@ApiOperation("手机查询本工序设备")
    @PostMapping("/selectEquipmentByProcess/{process}")
    public Result selectEquipmentByProcess(@PathVariable String process)    {
        return Result.seccess(reportingWorkService.selectEquipmentByProcessSv(process));
        return Result.success(reportingWorkService.selectEquipmentByProcessSv(process));
    }@ApiOperation("报工入库接口")
    @PostMapping("/saveWorkStorage")
    public Result saveWorkStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(reportingWorkService.saveWorkStorage(object));
        return Result.success(reportingWorkService.saveWorkStorage(object));

    }

    @ApiOperation("Mes报工基础数据")
    @PostMapping  ("/mesBasicData")
    public Result mesBasicData()  {
        return  Result.seccess(reportingWorkService.mesBasicDataSv());
        return  Result.success(reportingWorkService.mesBasicDataSv());
    }

}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java

@@ -34,14 +34,14 @@
    @SaCheckPermission("addRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
        return Result.success(reworkService.getSelectRework(pageNum,pageSize));
    }

    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("selectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
        return Result.success(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


@@ -49,14 +49,14 @@
    @SaCheckPermission("addRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.saveRework(object));
        return Result.success(reworkService.saveRework(object));
    }

    @ApiOperation("返工审核接口")
    @SaCheckPermission("selectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.updateRework(object));
        return Result.success(reworkService.updateRework(object));
    }

    @ApiOperation("返工流程卡明细查询接口")
@@ -66,7 +66,7 @@
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody FlowCard flowCard) {
        return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
        return Result.success(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));

    }

@@ -74,7 +74,7 @@
    @SaCheckPermission("selectRework.delete")
    @PostMapping("/deleteRework")
    public Result deleteRework( @RequestBody Map<String,Object> object){
        return Result.seccess(reworkService.deleteReworkSv(object));
        return Result.success(reworkService.deleteReworkSv(object));
    }

    @ApiOperation("返工打印自定义标签数据查询接口")
@@ -82,7 +82,7 @@
    public Result getSelectReworkPrintCustomLabel( @PathVariable String type,
                                                   @PathVariable Integer lableType,
                                                   @RequestBody Map<String, Object> object) {
        return Result.seccess(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));
        return Result.success(reworkService.getSelectReworkPrintCustomLabel(type,lableType,object));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/TagStyleController.java

@@ -20,33 +20,33 @@

    @PostMapping("saveTag")
    public Result saveTag(@RequestBody TagStyle tagStyle){
        return Result.seccess(tagStyleService.saveTag(tagStyle));
        return Result.success(tagStyleService.saveTag(tagStyle));
    }

    @GetMapping("getTagList")
    public Result getTagList(){
        return Result.seccess(tagStyleService.getTagList());
        return Result.success(tagStyleService.getTagList());
    }
    @GetMapping("getTagById/{id}")
    public Result getTagById(@PathVariable("id") Integer id){
        return Result.seccess(tagStyleService.getTagById(id));
        return Result.success(tagStyleService.getTagById(id));
    }

    @PostMapping("deleteTag/{id}")
    public Result deleteTag(@PathVariable("id") Integer id){
        return Result.seccess(tagStyleService.deleteTag(id));
        return Result.success(tagStyleService.deleteTag(id));
    }


    @PostMapping("updateTag")
    public Result updateTag(TagStyle tagStyle){
        return Result.seccess(tagStyleService.updateTag(tagStyle));
        return Result.success(tagStyleService.updateTag(tagStyle));
    }


    @PostMapping("addTag")
    public Result addTag(@RequestBody TagStyle tagStyle){
        return Result.seccess(tagStyleService.addTag(tagStyle));
        return Result.success(tagStyleService.addTag(tagStyle));
    }

    @ApiOperation("修改标签打印次数")
@@ -54,6 +54,6 @@
    public Result updatePrintNumber(
            @RequestBody Map<String, Object> object
    ) {
        return Result.seccess(tagStyleService.updatePrintNumberSv(object));
        return Result.success(tagStyleService.updatePrintNumberSv(object));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java

@@ -31,7 +31,7 @@
            @PathVariable List<String> selectDate,
            @PathVariable Integer state,
            @RequestBody OrderGlassDetail orderGlassDetail){
        return Result.seccess(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
        return Result.success(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
    }

    //转生产订单查询
@@ -40,7 +40,7 @@
    public Result addWork(
            @PathVariable String orderId,
            @RequestBody OrderDetail orderDetail){
        return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
        return Result.success(workOrderService.addDateWork(orderId,orderDetail));

    }

@@ -52,13 +52,13 @@
    public Result addOrderWork( @RequestBody Map<String,Object>  object){

//        if(workOrderService.addOrderWorkSv(object)){
//            return Result.seccess();
//            return Result.success();
//        }else {
//            throw new ServiceException(Constants.Code_500,"保存失败");
//
//        }

        return  Result.seccess(workOrderService.addOrderWorkSv(object));
        return  Result.success(workOrderService.addOrderWorkSv(object));
    }

    //删除工单
@@ -70,11 +70,11 @@
            @PathVariable String productionId
    ){
//        if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
//            return Result.seccess();
//            return Result.success();
//        }else {
//            throw new ServiceException(Constants.Code_500,"删除失败");
//
//        }
        return  Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
        return  Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
    }
}

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

@@ -23,15 +23,15 @@

    @GetMapping("/orderBasicData")
    public Result getOrderBasicData(){
        return Result.seccess(basicDataService.getOrderBasicData());
        return Result.success(basicDataService.getOrderBasicData());
    }
    @GetMapping("/BasicDataByType/{type}")
    public Result getBasicDataByType(@PathVariable String type){
        return Result.seccess(basicDataService.getBasicDataByType(type));
        return Result.success(basicDataService.getBasicDataByType(type));
    }
    @GetMapping("/BasicDataByType/{type}/{childType}")
    public Result getBasicDataByTypeAndChildType(@PathVariable String type,@PathVariable String childType){
        return Result.seccess(basicDataService.getBasicDataByTypeAndChildType(type,childType));
        return Result.success(basicDataService.getBasicDataByTypeAndChildType(type,childType));
    }


@@ -39,32 +39,32 @@
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicData")
    public Result getBasicData(){
        return Result.seccess(basicDataService.getBasicData());
        return Result.success(basicDataService.getBasicData());
    }
    @ApiOperation("查询基础数据类型")
    @SaCheckPermission("searchOrderBasicData.search")
    @GetMapping("/getBasicDataType")
    public Result getBasicDataType(){
        return Result.seccess(basicDataService.getBasicDataType());
        return Result.success(basicDataService.getBasicDataType());
    }

    @ApiOperation("新增基础数据")
    @SaCheckPermission("searchOrderBasicData.add")
    @PostMapping("addBasicData")
    public Result addBasicData(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicDataService.addBasicData(map));
        return  Result.success(basicDataService.addBasicData(map));
    }

    @ApiOperation("更新基础数据")
    @SaCheckPermission("searchOrderBasicData.update")
    @PostMapping("updateBasicData")
    public Result updateBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDataService.updateBasicData(basicData));
        return  Result.success(basicDataService.updateBasicData(basicData));
    }
    @ApiOperation("删除基础数据")
    @SaCheckPermission("searchOrderBasicData.delete")
    @PostMapping("deleteBasicData")
    public Result deleteBasicData(@RequestBody BasicData basicData){
        return  Result.seccess(basicDataService.deleteBasicData(basicData));
        return  Result.success(basicDataService.deleteBasicData(basicData));
    }
}

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

@@ -15,36 +15,36 @@

    @GetMapping("/getOneLevel")
    public Result getOneLevel(){
        return Result.seccess(basicGlassTypeServise.getOneLevel());
        return Result.success(basicGlassTypeServise.getOneLevel());
    }
    @GetMapping("/getTwoLevel")
    public Result getTwoLevel(){
        return Result.seccess(basicGlassTypeServise.getTwoLevel());
        return Result.success(basicGlassTypeServise.getTwoLevel());
    }

    @GetMapping("/getAll")
    public Result getAll(){
        return Result.seccess(basicGlassTypeServise.getAll());
        return Result.success(basicGlassTypeServise.getAll());
    }

    @GetMapping("/findAll")
    public Result findAll(){
        return Result.seccess(basicGlassTypeServise.findAll());
        return Result.success(basicGlassTypeServise.findAll());
    }

    @GetMapping("/deleteById/{id}")
    public Result deleteById(@PathVariable Integer id){
        return Result.seccess(basicGlassTypeServise.deleteById(id));
        return Result.success(basicGlassTypeServise.deleteById(id));
    }

    @GetMapping("/getOneLevelListMap")
    public Result getOneLevelListMap(){
        return Result.seccess(basicGlassTypeServise.getOneLevelListMap());
        return Result.success(basicGlassTypeServise.getOneLevelListMap());
    }

    @PostMapping("/add")
    public Result add(@RequestBody Map<String,Object> map){
        return Result.seccess(basicGlassTypeServise.add(map));
        return Result.success(basicGlassTypeServise.add(map));
    }

}

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

@@ -20,22 +20,22 @@
    @GetMapping("findAll")
    @PostMapping("findAll")
    public Result findAll(){
        return  Result.seccess(basicOtherMoneyService.findAll());
        return  Result.success(basicOtherMoneyService.findAll());
    }

    @PostMapping("deleteById/{id}")
    public Result deleteById(@PathVariable("id") Integer id){
        return  Result.seccess(basicOtherMoneyService.deleteById(id));
        return  Result.success(basicOtherMoneyService.deleteById(id));
    }

    @PostMapping("save")
    public Result save(@RequestBody Map<String,String> alias){
        return  Result.seccess(basicOtherMoneyService.save(alias.get("alias")));
        return  Result.success(basicOtherMoneyService.save(alias.get("alias")));
    }

    @PostMapping("findAllByState")
    public Result findAllByState(){
        return  Result.seccess(basicOtherMoneyService.findAllByState());
        return  Result.success(basicOtherMoneyService.findAllByState());
    }

}

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

@@ -25,30 +25,30 @@
    @ApiOperation("更新基础数据")
    @PostMapping("saveMaterialBomData")
    public Result saveMaterialBomData(@RequestBody Map<String, Object> object){
        return  Result.seccess(bomDataService.saveMaterialBomDataSv(object));
        return  Result.success(bomDataService.saveMaterialBomDataSv(object));
    }

    @ApiOperation("保存产品Bom")
    @PostMapping("saveProductBOM")
    public Result saveProductBOM(@RequestBody Map<String, Object> object){
        return  Result.seccess(bomDataService.saveProductBOMSv(object));
        return  Result.success(bomDataService.saveProductBOMSv(object));
    }
    @ApiOperation("查询订单BOM对应订单数据")
    @PostMapping("/getOrderBomData/{orderId}")
    public Result getOrderBomData(@PathVariable String orderId){
        return Result.seccess(bomDataService.getOrderBomDataSv(orderId));
        return Result.success(bomDataService.getOrderBomDataSv(orderId));
    }

    @ApiOperation("更新基础数据")
    @PostMapping("getBomDataProduct")
    public Result getBomDataProduct(@RequestBody Map<String, Object> object){
        return  Result.seccess(bomDataService.getBomDataProductSv(object));
        return  Result.success(bomDataService.getBomDataProductSv(object));
    }

    @ApiOperation("产品bom明细查询")
    @PostMapping("/editProductBOM/{produceId}")
    public Result editProductBOM(@PathVariable String produceId){
        return Result.seccess(bomDataService.editProductBOMSv(produceId));
        return Result.success(bomDataService.editProductBOMSv(produceId));
    }

}

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

@@ -39,28 +39,28 @@
    @SaCheckPermission("selectCustomer.search")
    @PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
        return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
        return Result.success(customerService.getSelectCustomer(pageNum,pageSize,customer));
    }

    @ApiOperation("客户新增修改接口")
    @SaCheckPermission("createCustomer.add")
    @PostMapping("/insertCustomer")
    public Result insertCustomer( @RequestBody Map<String,Object>  object){
        return Result.seccess(customerService.insertCustomer(object));
        return Result.success(customerService.insertCustomer(object));
    }

    @ApiOperation("客户删除接口")
    @SaCheckPermission("selectCustomer.delete")
    @PostMapping("/deleteCustomer")
    public Result deleteCustomer( @RequestBody Map<String,Object>  object){
        return Result.seccess(customerService.deleteCustomer(object));
        return Result.success(customerService.deleteCustomer(object));
    }

    @ApiOperation("客户订单查询接口")
    @SaCheckPermission("selectCustomerOrder.search")
    @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
        return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
        return Result.success(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
    }

    @ApiOperation("客户订单报表")

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

@@ -40,7 +40,7 @@
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery) throws JsonProcessingException {
        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
        return Result.success(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
    }

    /*发货报表查询*/
@@ -48,7 +48,7 @@
    @SaCheckPermission("deliveryReport.search")
    @PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
        return Result.success(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
    }

    /*发货报表查询*/
@@ -56,7 +56,7 @@
    @SaCheckPermission("deliveryReport.search")
    @PostMapping("/getSelectDeliveryDetailProductReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectDeliveryDetailProductReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
        return Result.success(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
    }

    /*发货订单明细查询*/
@@ -64,7 +64,7 @@
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
        return Result.success(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
    }

    /*库存可发货订单查询*/
@@ -72,7 +72,7 @@
    @SaCheckPermission("selectOrderList.search")
    @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Order order){
        return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
        return Result.success(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
    }

    /*发货订单明细查询*/
@@ -80,41 +80,41 @@
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
        return Result.success(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
    }
    @ApiOperation("发货新增接口")
    @SaCheckPermission("createDelivery.add")
    @PostMapping("/insertDelivery")
    public Result insertDelivery( @RequestBody Map<String,Object> object){
        return Result.seccess(deliveryService.insertDelivery(object));
        return Result.success(deliveryService.insertDelivery(object));
    }

    @ApiOperation("发货审核修改接口")
    @SaCheckPermission("createDelivery.review")
    @PostMapping("/updateDeliveryToExamine")
    public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
        return Result.seccess(deliveryService.updateDeliveryToExamine(object));
        return Result.success(deliveryService.updateDeliveryToExamine(object));
    }

    @ApiOperation("发货删除接口")
    @SaCheckPermission("selectDelivery.delete")
    @PostMapping("/deleteDelivery")
    public Result deleteDelivery( @RequestBody Map<String,Object> object){
        return Result.seccess(deliveryService.deleteDelivery(object));
        return Result.success(deliveryService.deleteDelivery(object));
    }

    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectDeliveryPrinting")
    public Result getSelectDeliveryPrinting( @RequestBody Map<String,Object> object) throws IllegalAccessException {
        return Result.seccess(deliveryService.getSelectDeliveryPrinting(object));
        return Result.success(deliveryService.getSelectDeliveryPrinting(object));
    }

    @ApiOperation("订单发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectOrderPrinting/{selectedValues}")
    public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
        return Result.success(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
    }

    @ApiOperation("发货明细报表")
@@ -135,7 +135,7 @@
    @PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
    public Result updateDeliveryPrintNumber(@PathVariable String deliveryId)  {

        return  Result.seccess(deliveryService.updateDeliveryPrintNumber(deliveryId));
        return  Result.success(deliveryService.updateDeliveryPrintNumber(deliveryId));
    }



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

@@ -27,31 +27,31 @@
    @PostMapping("/save")
    public Result save(@RequestBody Map<String,Object> prams ){

        return Result.seccess(glassPriceBasicService.save(prams));
        return Result.success(glassPriceBasicService.save(prams));
    }

    @ApiOperation("计算成品价格")
    @PostMapping("/glassPriceComputed/{productId}")
    public Result glassPriceComputed(@PathVariable String productId){
        return Result.seccess(glassPriceBasicService.glassPriceComputed(productId));
        return Result.success(glassPriceBasicService.glassPriceComputed(productId));
    }

    @ApiOperation("玻璃价格查询")
    @PostMapping("/searchGlassPrice")
    public Result searchGlassPrice(){
        return Result.seccess(glassPriceBasicService.searchGlassPrice());
        return Result.success(glassPriceBasicService.searchGlassPrice());
    }

    @ApiOperation("玻璃价格修改")
    @PostMapping("/updateGlassPriceById")
    public Result updateGlassPriceById(@RequestBody GlassPriceBasic glassPriceBasic){
        return Result.seccess(glassPriceBasicService.updateGlassPriceById(glassPriceBasic));
        return Result.success(glassPriceBasicService.updateGlassPriceById(glassPriceBasic));
    }

    @ApiOperation("玻璃价格删除")
    @PostMapping("/deleteGlassPriceById/{id}")
    public Result deleteGlassPriceById(@PathVariable String id){
        return Result.seccess(glassPriceBasicService.deleteGlassPriceById(id));
        return Result.success(glassPriceBasicService.deleteGlassPriceById(id));
    }



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

@@ -39,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);
        }
@@ -48,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);
        }
@@ -59,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);
        }
@@ -69,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));
    }


@@ -111,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")
@@ -124,21 +124,21 @@
    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")
@@ -150,7 +150,7 @@
                                 @PathVariable Integer model,//0:精确查找，1：模糊查询
                                 @PathVariable Integer scope,//模糊范围
                                 @RequestBody OrderDetail orderDetail)  {
        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));
        return  Result.success(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));

    }

@@ -161,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));

    }

@@ -172,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));

    }

@@ -203,83 +203,83 @@
    @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.seccess(orderService.uploadDxf(object));
        return  Result.success(orderService.uploadDxf(object));
    }

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

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



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

@@ -29,50 +29,50 @@
                                     @PathVariable Integer pageSize,
                                     @PathVariable List<String> glassType,
                                     @RequestBody Map<String,Object> config){
        return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,config));
        return Result.success(productService.defaultDateProduct(pageNum,pageSize,glassType,config));
    }
    @ApiOperation("其他系统获取产品查询接口")
    @PostMapping("/otherSysGetProduct")
    public Result otherSysGetProduct(){
        return Result.seccess(productService.otherSysGetProduct());
        return Result.success(productService.otherSysGetProduct());
    }

    @ApiOperation("产品保存接口")
    @SaCheckPermission("createProduct.add")
    @PostMapping("/saveProduct/{operator}")
    public Result saveProduct(@PathVariable String operator,@RequestBody Map<String,Object> product){
        return Result.seccess(productService.saveProduct(product,operator));
        return Result.success(productService.saveProduct(product,operator));
    }
    @ApiOperation("其他系统产品保存接口")
    @PostMapping("/otherSysSaveProduct")
    public Result otherSysSaveProduct(@RequestBody Map<String,Object> product){
        return Result.seccess(productService.saveProduct(product,null));
        return Result.success(productService.saveProduct(product,null));
    }

    @ApiOperation("产品查重接口")
    @SaCheckPermission("createProduct.add")
    @PostMapping("/selectProduct/{productName}")
    public Result selectProduct(@PathVariable String productName,@RequestBody Map<String,Object> product){
        return Result.seccess(productService.selectProduct(productName,product));
        return Result.success(productService.selectProduct(productName,product));
    }

    @ApiOperation("产品删除接口")
    @SaCheckPermission("selectProduct.delete")
    @PostMapping("/deleteProductById/{id}/{operator}")
    public Result deleteProductById(@PathVariable Integer id,@PathVariable String operator){
        return Result.seccess(productService.deleteProductById(id,operator));
        return Result.success(productService.deleteProductById(id,operator));
    }

    @ApiOperation("产品审核状态修改接口")
    @SaCheckPermission("createProduct.review")
    @PostMapping("/updateProductStateById/{id}/{state}/{operator}")
    public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state,@PathVariable String operator){
        return Result.seccess(productService.updateProductStateById(id,state,operator));
        return Result.success(productService.updateProductStateById(id,state,operator));
    }
    @ApiOperation("根据产品id查询产品接口")
    @SaCheckPermission("selectProduct.edit")
    @PostMapping("/selectProductById/{id}")
    public Result selectProductById(@PathVariable Integer id){
        return Result.seccess(productService.selectProductById(id));
        return Result.success(productService.selectProductById(id));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/AppVersionController.java

@@ -19,6 +19,6 @@

    @PostMapping("searchVersion")
    public Result searchVersion(){
        return Result.seccess(appVersionService.searchVersion());
        return Result.success(appVersionService.searchVersion());
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionBasicController.java

@@ -17,11 +17,11 @@

    @PostMapping("getPermission/{roleId}/{lang}")
    public Result getPermission(@PathVariable Integer roleId,@PathVariable String lang, @RequestBody List<Integer> selectPageId){
       return  Result.seccess(permissionBasicService.getPermission(roleId,lang,selectPageId));
       return  Result.success(permissionBasicService.getPermission(roleId,lang,selectPageId));
    }

    @PostMapping("getPermissionList/{lang}")
    public Result getPermission(@PathVariable String lang){
        return  Result.seccess(permissionBasicService.getPermissionList(lang));
        return  Result.success(permissionBasicService.getPermissionList(lang));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/PermissionRoleController.java

@@ -27,7 +27,7 @@
    @SaCheckPermission("roleList.update")
    @RequestMapping("/savePermissionRole")
    public Result savePermissionRole(@RequestBody Map<String, Object> permissionRole) {
        return Result.seccess(permissionRoleService.savePermissionRole(permissionRole));
        return Result.success(permissionRoleService.savePermissionRole(permissionRole));
    }



 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java

@@ -24,7 +24,7 @@
    @SaCheckPermission("roleList.search")
    @GetMapping("/findAll")
    public Result findAll(){
        return Result.seccess(roleService.findAll());
        return Result.success(roleService.findAll());
    }


@@ -32,7 +32,7 @@
    @SaCheckPermission("roleList.add")
    @PostMapping("/add")
    public Result add(@RequestBody Role role){
        return Result.seccess(roleService.add(role));
        return Result.success(roleService.add(role));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java

@@ -30,7 +30,7 @@
        MyChannelHandlerPool myChannelHandlerPool = new MyChannelHandlerPool();
        //myChannelHandlerPool.sendMsg("123");
        //MyChannelHandlerPool.channelGroup.writeAndFlush( new TextWebSocketFrame("123123"));
        return Result.seccess(sysMenuService.getMenu(lang));
        return Result.success(sysMenuService.getMenu(lang));

    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuItemController.java

@@ -20,6 +20,6 @@

    @GetMapping("/getMenuItem/{lang}")
    public Result getMenuItem(@PathVariable String lang){
        return Result.seccess(sysMenuItemService.getMenuItem(lang));
        return Result.success(sysMenuItemService.getMenuItem(lang));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java

@@ -39,7 +39,7 @@
        userService.deleteCache(userDTO.getUserId());
        UserDTO getUserDTO=userService.login(userDTO);
        if(getUserDTO!=null){
            return Result.seccess(userDTO);
            return Result.success(userDTO);
        }else{
            throw new ServiceException(Constants.Code_600,"用户名或密码错误");
        }
@@ -51,7 +51,7 @@
        if(getUser == null){
            throw new ServiceException(Constants.Code_500,"注册失败");
        }else {
            return Result.seccess(getUser);
            return Result.success(getUser);
        }

        //return
@@ -59,13 +59,13 @@
    @ApiOperation("修改密码")
    @PostMapping("/updatePassWord")
    public Result updatePassWord(@RequestBody Map<String,Object> object){
        return Result.seccess( userService.updatePassWord(object));
        return Result.success( userService.updatePassWord(object));
    }

    @ApiOperation("修改用户名")
    @PostMapping("/updateUserName")
    public Result updateUserName(@RequestBody Map<String,Object> object){
        return Result.seccess( userService.updateUserName(object));
        return Result.success( userService.updateUserName(object));
    }

}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java

@@ -26,26 +26,26 @@
    @PostMapping("/login")
    @ApiOperation("用户登录")
    public Result login(@RequestBody UserDTO userDTO) {
        return Result.seccess(userService.doLogin(userDTO));
        return Result.success(userService.doLogin(userDTO));
    }


    @ApiOperation("用户退出")
    @PostMapping("/logout")
    public Result logout() {
        return Result.seccess(userService.logout());
        return Result.success(userService.logout());
    }

    @ApiOperation("判断用户是否登录")
    @PostMapping("/isLogin")
    public Result isLogin() {
    return Result.seccess(userService.isLogin()); }
    return Result.success(userService.isLogin()); }

    @SaCheckLogin
    @ApiOperation("获取用户token")
    @PostMapping("/getTokenInfo")
    public Result userAdd() {
        return Result.seccess(StpUtil.getTokenInfo());
        return Result.success(StpUtil.getTokenInfo());
    }


@@ -53,7 +53,7 @@
    @ApiOperation("删除用户")
    @PostMapping("/userDelete/{id}")
    public Result userDelete(@PathVariable Integer id) {
        return Result.seccess(userService.userDelete(id));
        return Result.success(userService.userDelete(id));
    }


@@ -61,26 +61,26 @@
    @SaCheckPermission("userList.search")
    @GetMapping("findAll")
    public Result findAll(){
        return Result.seccess(userService.findAll());
        return Result.success(userService.findAll());
    }

    @ApiOperation("app查询报工班组列表")
    @PostMapping("findByAddress")
    public Result findByAddress(@RequestBody Map<String,String> userName){
        return Result.seccess(userService.findByAddress(userName));
        return Result.success(userService.findByAddress(userName));
    }

    @ApiOperation("查询所有工序")
    @SaCheckPermission("userList.search")
    @PostMapping("selectProcess")
    public Result selectProcess(){
        return Result.seccess(userService.selectProcessSv());
        return Result.success(userService.selectProcessSv());
    }

    @ApiOperation("修改用户工序")
    @SaCheckPermission("userList.search")
    @PostMapping("updateProcess/{id}/{process}")
    public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
        return Result.seccess(userService.updateProcessSv(id,process));
        return Result.success(userService.updateProcessSv(id,process));
    }
}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserRoleController.java

@@ -29,6 +29,6 @@
    @SaCheckPermission("userList.update")
    @PostMapping("/updateUserRole")
    public Result updateUserRole(@RequestBody Map<String,Object> params) {
        return Result.seccess(userRoleService.updateUserRole(params));
        return Result.success(userRoleService.updateUserRole(params));
    }
}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java

@@ -17,8 +17,10 @@
    List<Map<String, String>> processCardProgressMp(String orderId);

    List<CrossProcessBreakingDTO> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
    List<CrossProcessBreakingDTO> getNotProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);

    Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);
    Map<String, Integer> getNotProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);

    List<Map<String, String>> workInProgressMp(
            Integer offset, Integer pageSize,
@@ -48,6 +50,8 @@

    List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);

    List<CrossProcessBreakingDTO> exportNotCrossProcessBreakingMp(List<LocalDate> dates);

    Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);

    List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -332,6 +332,7 @@
//        return map;
//    }

    //跨工序次破
    public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize,
                                                      List<String> selectDate,
                                                      CrossProcessBreakingDTO crossProcessBreakingDTO) {
@@ -360,6 +361,55 @@

        CompletableFuture<Map<String, Integer>> totalFuture = asyncExecutor.runAsync(() ->
                reportMapper.getProcessBreakingTotal(offset, pageSize, finalStartDate, finalEndDate, crossProcessBreakingDTO));

        // 等待两个任务执行完毕
        CompletableFuture.allOf(dataFuture, totalFuture).join();

        try {
            result.put("data", dataFuture.get());
            result.put("total", totalFuture.get());
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("并行查询异常：" + e.getMessage(), e);
        }

        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        result.put("selectDate", list);

        return result;
    }

    //非跨工序次破
    public Map<String, Object> notCrossProcessBreakingSv(Integer pageNum, Integer pageSize,
                                                      List<String> selectDate,
                                                      CrossProcessBreakingDTO crossProcessBreakingDTO) {
        Integer offset = (pageNum - 1) * pageSize;

        // 默认时间范围：过去 15 天
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();

        if (selectDate != null && selectDate.size() == 2) {
            if (!selectDate.get(0).isEmpty()) {
                startDate = selectDate.get(0);
            }
            if (!selectDate.get(1).isEmpty()) {
                endDate = selectDate.get(1);
            }
        }

        Map<String, Object> result = new HashMap<>();

        // 使用异步线程池
        String finalEndDate = endDate;
        String finalStartDate = startDate;
        CompletableFuture<List<CrossProcessBreakingDTO>> dataFuture = asyncExecutor.runAsync(() ->
                reportMapper.getNotProcessBreaking(offset, pageSize, finalStartDate, finalEndDate, crossProcessBreakingDTO));

        CompletableFuture<Map<String, Integer>> totalFuture = asyncExecutor.runAsync(() ->
                reportMapper.getNotProcessBreakingTotal(offset, pageSize, finalStartDate, finalEndDate, crossProcessBreakingDTO));

        // 等待两个任务执行完毕
        CompletableFuture.allOf(dataFuture, totalFuture).join();
@@ -756,6 +806,10 @@
        return reportMapper.exportCrossProcessBreakingMp(dates);
    }

    public List exportNotCrossProcessBreakingSv(List<LocalDate> dates) {
        return reportMapper.exportNotCrossProcessBreakingMp(dates);
    }

    //    public List exportTeamOutputSv(Map<String, Object> dates) {
//        List<LocalDate> date= (List<LocalDate>) dates.get("date");
//        String process= (String) dates.get("processes");

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -326,6 +326,75 @@
        limit #{offset},#{pageSize}
    </select>

    <select id="getNotProcessBreaking" resultMap="damageDetailsTableMap">
        select rw.reporting_work_id,
        rw.reporting_work_time,
        dd.responsible_process,
        dd.responsible_team,
        dd.breakage_type,
        dd.breakage_reason,
        dd.responsible_personnel,
        ROUND((dd.breakage_quantity))                                                   as breakage_quantity,
        round(ogd.child_width * ogd.child_height * (dd.breakage_quantity) / 1000000, 2) as area,
        rw.this_process,
        o.project,
        o.order_id,
        ogd.glass_child,
        rw.this_process,
        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
        CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
        rw.creator
        from
        sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
        left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
        left join pp.reporting_work as rw on rw.order_id=o.order_id
        left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
        and dd.technology_number=ogd.technology_number
        where date(rw.reporting_work_time) >= #{startDate}
        and date(rw.reporting_work_time) &lt;= #{endDate}
        and rw.this_worn_quantity > 0
        and dd.available = 0
        and reviewed_state != 2
        and rw.this_process = dd.responsible_process
        and o.create_order>0
        <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
            and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
        </if>
        <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
            and rw.process_id regexp #{crossProcessBreakingDTO.processId}
        </if>
        <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
            and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
        </if>
        <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
            and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
        </if>
        <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
            and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
        </if>
        <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
            and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
        </if>
        <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
            and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
        </if>
        <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
            and o.project regexp #{crossProcessBreakingDTO.project}
        </if>
        <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
            and o.order_id regexp #{crossProcessBreakingDTO.orderId}
        </if>
        <if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
            and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
        </if>
        <if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
            and rw.creator regexp #{crossProcessBreakingDTO.creator}
        </if>
        GROUP BY dd.id
        order by dd.id desc
        limit #{offset},#{pageSize}
    </select>

    <select id="getProcessBreakingTotal">
        select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
               count(distinct dd.id)               as 'total'
@@ -343,6 +412,56 @@
          and dd.available = 0
          and reviewed_state != 2
          and rw.this_process != dd.responsible_process
        <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
            and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
        </if>
        <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
            and rw.process_id regexp #{crossProcessBreakingDTO.processId}
        </if>
        <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
            and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
        </if>
        <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
            and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
        </if>
        <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
            and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
        </if>
        <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
            and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
        </if>
        <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
            and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
        </if>
        <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
            and o.project regexp #{crossProcessBreakingDTO.project}
        </if>
        <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
            and o.order_id regexp #{crossProcessBreakingDTO.orderId}
        </if>
        <if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
            and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
        </if>
        order by dd.id desc
    </select>

    <select id="getNotProcessBreakingTotal">
        select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
        count(distinct dd.id)               as 'total'
        from pp.damage_details as dd
        left join pp.reporting_work as rw
        on rw.reporting_work_id = dd.reporting_work_id
        left join sd.order as o
        on rw.order_id = o.order_id
        left join sd.order_glass_detail as ogd
        on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
        and ogd.technology_number and dd.technology_number
        where date(rw.reporting_work_time) >= #{startDate}
        and date(rw.reporting_work_time) &lt;= #{endDate}
        and rw.this_worn_quantity > 0
        and dd.available = 0
        and reviewed_state != 2
        and rw.this_process = dd.responsible_process
        <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
            and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
        </if>
@@ -1074,7 +1193,11 @@
               rw.this_process,
               o.project,
               o.order_id,
               ogd.glass_child
               ogd.glass_child,
               rw.this_process,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
               CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
               rw.creator
        from damage_details as dd
                 left join reporting_work as rw
                           on rw.reporting_work_id = dd.reporting_work_id
@@ -1083,12 +1206,49 @@
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
                               and ogd.technology_number and dd.technology_number
                 left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
        where date(rw.reporting_work_time) >= #{dates[0]}
          and date(rw.reporting_work_time) &lt;= #{dates[1]}
          and rw.this_worn_quantity > 0
          and dd.available = 0
          and reviewed_state != 2
          and rw.this_process != dd.responsible_process
        GROUP BY dd.id
        order by dd.id desc
    </select>

    <select id="exportNotCrossProcessBreakingMp">
        select rw.reporting_work_id,
               rw.reporting_work_time,
               dd.responsible_process,
               dd.responsible_team,
               dd.breakage_type,
               dd.breakage_reason,
               ROUND((dd.breakage_quantity))                                                   as breakage_quantity,
               round(ogd.child_width * ogd.child_height * (dd.breakage_quantity) / 1000000, 2) as area,
               rw.this_process,
               o.project,
               o.order_id,
               ogd.glass_child,
               rw.this_process,
               JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
               CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
               rw.creator
        from damage_details as dd
                 left join reporting_work as rw
                           on rw.reporting_work_id = dd.reporting_work_id
                 left join sd.order as o
                           on rw.order_id = o.order_id
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
                               and ogd.technology_number and dd.technology_number
                 left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
        where date(rw.reporting_work_time) >= #{dates[0]}
          and date(rw.reporting_work_time) &lt;= #{dates[1]}
          and rw.this_worn_quantity > 0
          and dd.available = 0
          and reviewed_state != 2
          and rw.this_process = dd.responsible_process
        GROUP BY dd.id
        order by dd.id desc
    </select>
@@ -1111,13 +1271,17 @@
               IFNULL(dd.responsible_personnel, '')                                          as personnel,
               ogd.glass_child,
               ogd.child_width,
               ogd.child_height
               ogd.child_height,
               ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
               rw.this_process,
               rw.creator
        FROM sd.ORDER AS o
                 LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
                 LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
                 LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
            AND dd.order_number = ogd.order_number
            AND dd.technology_number = ogd.technology_number
            left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
        WHERE rw.reporting_work_time >= #{dates[0]}
          and rw.reporting_work_time &lt;= #{dates[1]}
          AND dd.available = 0 and rw.reviewed_state>=0