north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
@@ -28,7 +28,7 @@ } @ApiOperation("查询所有基础数据接口") @SaCheckPermission("SelectProductionBasicData.search") @SaCheckPermission("selectProductionBasicData.search") @PostMapping ("/selectBasic") public Result selectBasic() { return Result.seccess(basicDateProduceService.selectBasicSv()); @@ -43,7 +43,7 @@ } @ApiOperation("删除基础数据接口") @SaCheckPermission("SelectProductionBasicData.delete") @SaCheckPermission("selectProductionBasicData.delete") @PostMapping("/deleteBasic/{id}") public Result deleteBasic(@PathVariable String id){ if(basicDateProduceService.deleteBasicSv(id)){ @@ -69,7 +69,7 @@ } @ApiOperation("班组基础数据添加接口") @SaCheckPermission("AddTeamGroup.add") @SaCheckPermission("addTeamGroup.add") @PostMapping("/saveTeamGroup") public Result saveTeamGroup( @RequestBody Map<String,Object> object){ if(basicDateProduceService.saveTeamGroupSv(object)){ @@ -81,7 +81,7 @@ } @ApiOperation("次破类型基础数据添加接口") @SaCheckPermission("AddBreakageType.add") @SaCheckPermission("addBreakageType.add") @PostMapping("/saveBreakageType") public Result saveBreakageType( @RequestBody Map<String,Object> object){ if(basicDateProduceService.saveBreakageTypeSv(object)){ @@ -93,7 +93,7 @@ } @ApiOperation("次破原因基础数据添加接口") @SaCheckPermission("AddBreakageReason.add") @SaCheckPermission("addBreakageReason.add") @PostMapping("/saveBreakageReason") public Result saveBreakageReason( @RequestBody Map<String,Object> object){ if(basicDateProduceService.saveBreakageReasonSv(object)){ north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -22,7 +22,7 @@ DeviceMaintenanceService deviceMaintenanceService; @ApiOperation("设备新增接口") @SaCheckPermission("AddMachine.add") @SaCheckPermission("addMachine.add") @PostMapping("/saveMachine") public Result saveTeamGroup( @RequestBody Map<String,Object> object){ if(deviceMaintenanceService.saveMachineSv(object)){ @@ -39,7 +39,7 @@ } @ApiOperation("保养维修新增接口") @SaCheckPermission("AddMaintenanceAndRepair.add") @SaCheckPermission("addMaintenanceAndRepair.add") @PostMapping("/saveMaintenanceAndRepair") public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){ if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){ @@ -61,7 +61,7 @@ @ApiOperation("删除维修保养记录接口") @SaCheckPermission("MaintenanceAndRepair.delete") @SaCheckPermission("maintenanceAndRepair.delete") @PostMapping("/deleteMaintenance/{id}") public Result deleteMaintenance(@PathVariable String id){ if(deviceMaintenanceService.deleteMaintenanceSv(id)){ @@ -73,7 +73,7 @@ } @ApiOperation("查询设备管理接口") @SaCheckPermission("SelectMachine.search") @SaCheckPermission("selectMachine.search") @PostMapping ("/selectMachine") public Result selectMachine() { return Result.seccess(deviceMaintenanceService.selectMachineSv()); north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -27,7 +27,7 @@ //流程卡管理查询 @ApiOperation("流程卡管理查询接口") @SaCheckPermission("SelectProcessCard.search") @SaCheckPermission("selectProcessCard.search") @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}") public Result dateProcess( @PathVariable Integer pageNum, @@ -41,7 +41,7 @@ //分架查询 @ApiOperation("分架查询接口") @SaCheckPermission("SelectAddProcess.search") @SaCheckPermission("selectAddProcess.search") @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}") public Result selectAddProcess( @PathVariable Date selectTime1, @@ -52,7 +52,7 @@ //分架明细查询 @ApiOperation("分架明细查询接口") @SaCheckPermission("SplittingDetails.search") @SaCheckPermission("splittingDetails.search") @PostMapping("/detailsSelect/{orderId}") public Result detailsSelect( @PathVariable String orderId, @@ -64,7 +64,7 @@ //删除流程卡 @ApiOperation("删除流程卡接口") @SaCheckPermission("SelectProcessCard.delete") @SaCheckPermission("selectProcessCard.delete") @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}") public Result deleteOrderWork( @PathVariable String orderId, @@ -83,7 +83,7 @@ //修改排版状态 @ApiOperation("修改排版状态接口") @SaCheckPermission("SelectProcessCard.review") @SaCheckPermission("selectProcessCard.review") @PostMapping("/updateLayoutStatus/{processId}/{state}") public Result updateLayoutStatus( @PathVariable String processId, @@ -110,7 +110,7 @@ //添加流程卡 @ApiOperation("流程卡创建接口") @SaCheckPermission("AddProcessCard.add") @SaCheckPermission("addProcessCard.add") @PostMapping("/addFlowCard") public Result AddOrderWork(@RequestBody Map<String, Object> object) { if (flowCardService.addFlowCardSv(object)) { @@ -148,7 +148,7 @@ //流程卡明细查询 @ApiOperation("流程卡明细查询接口") @SaCheckPermission("SelectDetailProcessCard.search") @SaCheckPermission("selectDetailProcessCard.search") @PostMapping("/flowCardDetail/{processId}") public Result flowCardDetail( @PathVariable String processId, @@ -158,7 +158,7 @@ } @ApiOperation("流程卡打印查询接口") @SaCheckPermission("SelectPrintFlowCard.search") @SaCheckPermission("selectPrintFlowCard.search") @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}") public Result selectPrintFlowCard( @PathVariable Date selectTime1, @@ -171,7 +171,7 @@ } @ApiOperation("流程卡明细查询接口") @SaCheckPermission("PrintFlowCard.search") @SaCheckPermission("printFlowCard.search") @PostMapping("/selectPrint/{inquiryMode}") public Result selectPrint( @PathVariable String inquiryMode, @@ -217,7 +217,7 @@ } @ApiOperation("复选框修改排版状态") @SaCheckPermission("SelectProcessCard.review") @SaCheckPermission("selectProcessCard.review") @PostMapping("/updateComposing") public Result updateComposing( @RequestBody Map<String, Object> object @@ -258,7 +258,7 @@ } @ApiOperation("工程打印查询接口") @SaCheckPermission("SelectPrintFlowCard.search") @SaCheckPermission("selectPrintFlowCard.search") @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}") public Result selectPrintFlowCard( @PathVariable Date selectTime1, @@ -351,7 +351,7 @@ } @ApiOperation("复选框删除流程卡") @SaCheckPermission("SelectProcessCard.delete") @SaCheckPermission("selectProcessCard.delete") @PostMapping("/checkboxDelete") public Result checkboxDelete( @RequestBody Map<String, Object> object north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -23,7 +23,7 @@ //查询第一次排版数据 @ApiOperation("加载时查询排版数据接口") @SaCheckPermission("ProductionScheduling.search") @SaCheckPermission("productionScheduling.search") @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}") public Result selectLastScheduling( @PathVariable String selectTime1, @@ -36,7 +36,7 @@ } //点击查询排版数据 @ApiOperation("点击查询排版数据接口") @SaCheckPermission("ProductionScheduling.search") @SaCheckPermission("productionScheduling.search") @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}") public Result selectScheduling( @PathVariable Integer pageNum, @@ -56,7 +56,7 @@ //添加排产数据 @ApiOperation("添加排产数据接口") @SaCheckPermission("ProductionScheduling.add") @SaCheckPermission("productionScheduling.add") @PostMapping("/addScheduling") public Result addScheduling( @RequestBody Map<String,Object> object){ @@ -70,7 +70,7 @@ //删除排产数据 @ApiOperation("删除排产数据接口") @SaCheckPermission("ProductionScheduling.delete") @SaCheckPermission("productionScheduling.delete") @PostMapping("/deleteScheduling") public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{ @@ -83,7 +83,7 @@ } @ApiOperation("排版审核接口") @SaCheckPermission("ProductionScheduling.review") @SaCheckPermission("productionScheduling.review") @PostMapping("/examineScheduling") public Result examineScheduling( @RequestBody Map<String,Object> object){ @@ -96,7 +96,7 @@ } @ApiOperation("排版反审接口") @SaCheckPermission("ProductionScheduling.review") @SaCheckPermission("productionScheduling.review") @PostMapping("/cancelReviewScheduling") public Result cancelReviewScheduling( @RequestBody Map<String,Object> object){
@@ -32,14 +32,14 @@ /*发货订单查询*/ @ApiOperation("补片新增查询接口") @SaCheckPermission("AddReplenish.search") @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)); } @ApiOperation("补片查询接口") @SaCheckPermission("SelectReplenish.search") @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)); @@ -47,21 +47,21 @@ @ApiOperation("补片新增接口") @SaCheckPermission("AddReplenish.add") @SaCheckPermission("addReplenish.add") @PostMapping("/saveReplenish") public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){ return Result.seccess(replenishService.saveReplenish(object)); } @ApiOperation("补片审核接口") @SaCheckPermission("SelectReplenish.review") @SaCheckPermission("selectReplenish.review") @PostMapping("/updateReplenish") public Result updateReplenish( @RequestBody Map<String,Object> object){ return Result.seccess(replenishService.updateReplenish(object)); } @ApiOperation("补片流程卡明细查询接口") @SaCheckPermission("PrintFlowCard.search") @SaCheckPermission("printFlowCard.search") @PostMapping("/selectPrint/{selectTime1}/{selectTime2}") public Result selectPrint( @PathVariable Date selectTime1, @@ -81,14 +81,14 @@ } @ApiOperation("补片删除接口") @SaCheckPermission("SelectReplenish.delete") @SaCheckPermission("selectReplenish.delete") @PostMapping("/deleteReplenish") public Result deleteReplenish( @RequestBody Map<String,Object> object){ return Result.seccess(replenishService.deleteReplenishSv(object)); } @ApiOperation("补片反审接口") @SaCheckPermission("SelectReplenish.countertrial") @SaCheckPermission("selectReplenish.countertrial") @PostMapping("/updateCancelReview") public Result updateCancelReview( @RequestBody Map<String,Object> object){ return Result.seccess(replenishService.updateCancelReviewSv(object)); north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -38,14 +38,14 @@ //流程卡进度 @ApiOperation("流程卡进度") @SaCheckPermission("ProcessCardProgress.search") @SaCheckPermission("processCardProgress.search") @PostMapping("/processCardProgress/{orderId}") public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) { return Result.seccess(reportService.processCardProgressSv(orderId, columns)); } @ApiOperation("跨工序次破") @SaCheckPermission("CrossProcessBreaking.search") @SaCheckPermission("crossProcessBreaking.search") @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}") public Result getOrderReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @@ -56,7 +56,7 @@ } @ApiOperation("在制品报表") @SaCheckPermission("WorkInProgress.search") @SaCheckPermission("workInProgress.search") @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}") public Result workInProgress( @PathVariable Integer pageNum, @@ -71,7 +71,7 @@ } @ApiOperation("工序待完成报表") @SaCheckPermission("ProcessToBeCompleted.search") @SaCheckPermission("processToBeCompleted.search") @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}") public Result selectProcessToBeCompleted( @PathVariable Date selectTime1, @@ -85,7 +85,7 @@ } @ApiOperation("次破明细报表") @SaCheckPermission("DamageReport.search") @SaCheckPermission("damageReport.search") @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}") public Result damageReport( @PathVariable Integer pageNum, @@ -98,7 +98,7 @@ } @ApiOperation("分架明细报表") @SaCheckPermission("SplittingDetailsOutside.search") @SaCheckPermission("splittingDetailsOutside.search") @PostMapping("/splittingDetailsOutside/{orderId}") public Result splittingDetailsOutside( @PathVariable String orderId, @@ -108,7 +108,7 @@ } @ApiOperation("品质报表") @SaCheckPermission("QualityReport.search") @SaCheckPermission("qualityReport.search") @PostMapping("/qualityReport/{selectTime1}/{selectTime2}") public Result qualityReport( @PathVariable Date selectTime1, @@ -119,7 +119,7 @@ } @ApiOperation("成品率报表") @SaCheckPermission("Yield.search") @SaCheckPermission("yield.search") @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}") public Result yield( @PathVariable Date selectTime1, @@ -131,14 +131,14 @@ } @ApiOperation("生产发货进度") @SaCheckPermission("ProductionSchedule.search") @SaCheckPermission("productionSchedule.search") @PostMapping("/productionSchedule/{orderId}") public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) { return Result.seccess(reportService.productionScheduleSv(orderId, columns)); } @ApiOperation("任务完成情况汇总进度") @SaCheckPermission("TaskCompletionStatus.search") @SaCheckPermission("taskCompletionStatus.search") @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}") public Result taskCompletionStatus(@PathVariable Date selectTime1, @PathVariable Date selectTime2, @@ -147,7 +147,7 @@ } @ApiOperation("订单计划分解") @SaCheckPermission("OrderPlanDecomposition.search") @SaCheckPermission("orderPlanDecomposition.search") @PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}") public Result orderPlanDecomposition(@PathVariable Date selectTime1, @PathVariable Date selectTime2, @@ -156,7 +156,7 @@ } @ApiOperation("原片领料") @SaCheckPermission("RawMaterialRequisition.search") @SaCheckPermission("rawMaterialRequisition.search") @PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}") public Result rawMaterialRequisition(@PathVariable Date selectTime1, @PathVariable Date selectTime2, @@ -165,7 +165,7 @@ } @ApiOperation("班组产量明细报表") @SaCheckPermission("DamageReport.search") @SaCheckPermission("damageReport.search") @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}") public Result teamOutput( @PathVariable Integer pageNum, north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -30,7 +30,7 @@ } @ApiOperation("报工新增查询") @SaCheckPermission("AddReportingWork.search") @SaCheckPermission("addReportingWork.search") @PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}/{reportType}") public Result AddSelectLastWork( @PathVariable String processIdStr, @@ -46,14 +46,14 @@ } @ApiOperation("报工新增") @SaCheckPermission("AddReportingWork.add") @SaCheckPermission("addReportingWork.add") @PostMapping ("/saveReportingWork") public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork) { return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork)); } @ApiOperation("报工审核") @SaCheckPermission("AddReportingWork.review") @SaCheckPermission("addReportingWork.review") @PostMapping ("/reviewReportingWork") public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork) { return Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork)); @@ -65,14 +65,14 @@ return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId)); } @ApiOperation("报工修改") @SaCheckPermission("AddReportingWork.update") @SaCheckPermission("addReportingWork.update") @PostMapping ("/updateReportingWork/{reviewState}") public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork) { return Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState)); } @ApiOperation("报工查询接口") @SaCheckPermission("SelectReportingWorks.search") @SaCheckPermission("selectReportingWorks.search") @PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}") public Result selectReportingWork( @PathVariable Integer pageNum, @@ -86,7 +86,7 @@ } @ApiOperation("删除报工接口") @SaCheckPermission("SelectReportingWorks.delete") @SaCheckPermission("selectReportingWorks.delete") @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}") public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId, @PathVariable String thisProcess,@PathVariable String userId @@ -97,7 +97,7 @@ } @ApiOperation("质检审核查询接口") @SaCheckPermission("QualityInspectionReview.search") @SaCheckPermission("qualityInspectionReview.search") @PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}") public Result selectQualityTesting( @PathVariable Integer pageNum, @@ -112,7 +112,7 @@ } @ApiOperation("质检审核审核") @SaCheckPermission("QualityInspectionReview.review") @SaCheckPermission("qualityInspectionReview.review") @PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}") public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username) { if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){ north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -31,14 +31,14 @@ /*发货订单查询*/ @ApiOperation("可返工数据查询接口") @SaCheckPermission("AddRework.search") @SaCheckPermission("addRework.search") @PostMapping("/getSelectRework/{pageNum}/{pageSize}") public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){ return Result.seccess(reworkService.getSelectRework(pageNum,pageSize)); } @ApiOperation("返工数据查询接口") @SaCheckPermission("SelectRework.search") @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)); @@ -46,21 +46,21 @@ @ApiOperation("返工接口新增") @SaCheckPermission("AddRework.add") @SaCheckPermission("addRework.add") @PostMapping("/saveRework") public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){ return Result.seccess(reworkService.saveRework(object)); } @ApiOperation("返工审核接口") @SaCheckPermission("SelectRework.review") @SaCheckPermission("selectRework.review") @PostMapping("/updateRework") public Result updateRework( @RequestBody Map<String,Object> object){ return Result.seccess(reworkService.updateRework(object)); } @ApiOperation("返工流程卡明细查询接口") @SaCheckPermission("PrintFlowCard.search") @SaCheckPermission("printFlowCard.search") @PostMapping("/selectPrint/{selectTime1}/{selectTime2}") public Result selectPrint( @PathVariable Date selectTime1, @@ -71,7 +71,7 @@ } @ApiOperation("返工删除接口") @SaCheckPermission("SelectRework.delete") @SaCheckPermission("selectRework.delete") @PostMapping("/deleteRework") public Result deleteRework( @RequestBody Map<String,Object> object){ return Result.seccess(reworkService.deleteReworkSv(object)); north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
@@ -24,7 +24,7 @@ //查询工单 @ApiOperation("查询工单接口") @SaCheckPermission("SelectWorkOrder.search") @SaCheckPermission("selectWorkOrder.search") @PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}") public Result dateWork( @PathVariable Date selectTime1, @@ -63,7 +63,7 @@ //删除工单 @ApiOperation("删除工单接口") @SaCheckPermission("SelectWorkOrder.delete") @SaCheckPermission("selectWorkOrder.delete") @PostMapping("/deleteOrderWork/{orderId}/{productionId}") public Result deleteOrderWork( @PathVariable String orderId,
