From ff4bfe3a8b548a21b66348241afd232372474386 Mon Sep 17 00:00:00 2001 From: yanyang Date: Wed, 22 Feb 2023 16:13:08 +0800 Subject: [PATCH 1/2] m --- .../ChangePackagingBoxHistoryController.java | 116 ++++++++++++ .../code/controller/PrintModelController.java | 116 ++++++++++++ .../WoCompensationPowerController.java | 116 ++++++++++++ .../controller/WoPackagingBoxController.java | 116 ++++++++++++ .../WoPackagingBoxSubstrateController.java | 116 ++++++++++++ .../WoPackagingPrintHistoryController.java | 116 ++++++++++++ .../controller/WoPowerLevelController.java | 116 ++++++++++++ .../dto/ChangePackagingBoxHistoryDTO.java | 80 ++++++++ .../generator/code/dto/PrintModelDTO.java | 80 ++++++++ .../code/dto/WoCompensationPowerDTO.java | 74 ++++++++ .../generator/code/dto/WoPackagingBoxDTO.java | 113 ++++++++++++ .../code/dto/WoPackagingBoxSubstrateDTO.java | 74 ++++++++ .../code/dto/WoPackagingPrintHistoryDTO.java | 83 +++++++++ .../generator/code/dto/WoPowerLevelDTO.java | 83 +++++++++ .../entity/ChangePackagingBoxHistory.java | 118 ++++++++++++ .../generator/code/entity/PrintModel.java | 118 ++++++++++++ .../code/entity/WoCompensationPower.java | 108 +++++++++++ .../generator/code/entity/WoPackagingBox.java | 173 ++++++++++++++++++ .../code/entity/WoPackagingBoxSubstrate.java | 108 +++++++++++ .../code/entity/WoPackagingPrintHistory.java | 123 +++++++++++++ .../generator/code/entity/WoPowerLevel.java | 124 +++++++++++++ .../excel/ChangePackagingBoxHistoryExcel.java | 56 ++++++ .../generator/code/excel/PrintModelExcel.java | 56 ++++++ .../code/excel/WoCompensationPowerExcel.java | 52 ++++++ .../code/excel/WoPackagingBoxExcel.java | 78 ++++++++ .../excel/WoPackagingBoxSubstrateExcel.java | 52 ++++++ .../excel/WoPackagingPrintHistoryExcel.java | 58 ++++++ .../code/excel/WoPowerLevelExcel.java | 58 ++++++ .../ChangePackagingBoxHistoryMapper.java | 16 ++ .../ChangePackagingBoxHistoryMapper.xml | 25 +++ .../code/mapper/PrintModelMapper.java | 16 ++ .../code/mapper/PrintModelMapper.xml | 25 +++ .../mapper/WoCompensationPowerMapper.java | 16 ++ .../code/mapper/WoCompensationPowerMapper.xml | 23 +++ .../code/mapper/WoPackagingBoxMapper.java | 16 ++ .../code/mapper/WoPackagingBoxMapper.xml | 36 ++++ .../mapper/WoPackagingBoxSubstrateMapper.java | 16 ++ .../mapper/WoPackagingBoxSubstrateMapper.xml | 23 +++ .../mapper/WoPackagingPrintHistoryMapper.java | 16 ++ .../mapper/WoPackagingPrintHistoryMapper.xml | 26 +++ .../code/mapper/WoPowerLevelMapper.java | 16 ++ .../code/mapper/WoPowerLevelMapper.xml | 26 +++ .../mysql/ChangePackagingBoxHistorymysql.sql | 7 + .../generator/code/mysql/PrintModelmysql.sql | 7 + .../code/mysql/WoCompensationPowermysql.sql | 7 + .../mysql/WoPackagingBoxSubstratemysql.sql | 7 + .../code/mysql/WoPackagingBoxmysql.sql | 7 + .../mysql/WoPackagingPrintHistorymysql.sql | 7 + .../code/mysql/WoPowerLevelmysql.sql | 7 + .../ChangePackagingBoxHistoryServiceBiz.java | 15 ++ .../code/service/PrintModelServiceBiz.java | 15 ++ .../WoCompensationPowerServiceBiz.java | 15 ++ .../service/WoPackagingBoxServiceBiz.java | 15 ++ .../WoPackagingBoxSubstrateServiceBiz.java | 15 ++ .../WoPackagingPrintHistoryServiceBiz.java | 15 ++ .../code/service/WoPowerLevelServiceBiz.java | 15 ++ ...angePackagingBoxHistoryServiceBizImpl.java | 34 ++++ .../impl/PrintModelServiceBizImpl.java | 34 ++++ .../WoCompensationPowerServiceBizImpl.java | 34 ++++ .../impl/WoPackagingBoxServiceBizImpl.java | 34 ++++ ...WoPackagingBoxSubstrateServiceBizImpl.java | 34 ++++ ...WoPackagingPrintHistoryServiceBizImpl.java | 34 ++++ .../impl/WoPowerLevelServiceBizImpl.java | 34 ++++ ym-packing/pom.xml | 5 - 64 files changed, 3369 insertions(+), 5 deletions(-) create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/ChangePackagingBoxHistoryController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WoCompensationPowerController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingPrintHistoryController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/ChangePackagingBoxHistoryDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WoCompensationPowerDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingPrintHistoryDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/ChangePackagingBoxHistory.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WoCompensationPower.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingPrintHistory.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/ChangePackagingBoxHistoryExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WoCompensationPowerExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingPrintHistoryExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.xml create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/ChangePackagingBoxHistorymysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoCompensationPowermysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingPrintHistorymysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/ChangePackagingBoxHistoryServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WoCompensationPowerServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxSubstrateServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingPrintHistoryServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoCompensationPowerServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingPrintHistoryServiceBizImpl.java create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/ChangePackagingBoxHistoryController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/ChangePackagingBoxHistoryController.java new file mode 100644 index 0000000..82d7f80 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/ChangePackagingBoxHistoryController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO; +import com.cnbm.generator.code.excel.ChangePackagingBoxHistoryExcel; +import com.cnbm.generator.code.service.ChangePackagingBoxHistoryServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 包装箱拆合箱历史表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-16 + */ +@RestController +@RequestMapping("/code/changePackagingBoxHistory") +@Api(tags="包装箱拆合箱历史表") +public class ChangePackagingBoxHistoryController { + @Autowired + private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = changePackagingBoxHistoryService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:info')") + public Result get(@PathVariable("id") Long id){ + ChangePackagingBoxHistoryDTO data = changePackagingBoxHistoryService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:save')") + public Result save(@RequestBody ChangePackagingBoxHistoryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + changePackagingBoxHistoryService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:update')") + public Result update(@RequestBody ChangePackagingBoxHistoryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + changePackagingBoxHistoryService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + changePackagingBoxHistoryService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = changePackagingBoxHistoryService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, ChangePackagingBoxHistoryExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java new file mode 100644 index 0000000..804f2a2 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.PrintModelDTO; +import com.cnbm.generator.code.excel.PrintModelExcel; +import com.cnbm.generator.code.service.PrintModelServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 打印标签模板表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@RestController +@RequestMapping("/code/printModel") +@Api(tags="打印标签模板表") +public class PrintModelController { + @Autowired + private PrintModelServiceBiz printModelService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:printModel:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = printModelService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:printModel:info')") + public Result get(@PathVariable("id") Long id){ + PrintModelDTO data = printModelService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:printModel:save')") + public Result save(@RequestBody PrintModelDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + printModelService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:printModel:update')") + public Result update(@RequestBody PrintModelDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + printModelService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:printModel:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + printModelService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:printModel:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = printModelService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, PrintModelExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoCompensationPowerController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoCompensationPowerController.java new file mode 100644 index 0000000..6e7e0e4 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoCompensationPowerController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.WoCompensationPowerDTO; +import com.cnbm.generator.code.excel.WoCompensationPowerExcel; +import com.cnbm.generator.code.service.WoCompensationPowerServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 基板补偿功率 表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@RestController +@RequestMapping("/code/woCompensationPower") +@Api(tags="基板补偿功率 表") +public class WoCompensationPowerController { + @Autowired + private WoCompensationPowerServiceBiz woCompensationPowerService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = woCompensationPowerService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:info')") + public Result get(@PathVariable("id") Long id){ + WoCompensationPowerDTO data = woCompensationPowerService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:save')") + public Result save(@RequestBody WoCompensationPowerDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + woCompensationPowerService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:update')") + public Result update(@RequestBody WoCompensationPowerDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + woCompensationPowerService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + woCompensationPowerService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woCompensationPowerService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, WoCompensationPowerExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java new file mode 100644 index 0000000..8dece49 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.WoPackagingBoxDTO; +import com.cnbm.generator.code.excel.WoPackagingBoxExcel; +import com.cnbm.generator.code.service.WoPackagingBoxServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 包装箱表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-22 + */ +@RestController +@RequestMapping("/code/woPackagingBox") +@Api(tags="包装箱表") +public class WoPackagingBoxController { + @Autowired + private WoPackagingBoxServiceBiz woPackagingBoxService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = woPackagingBoxService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:info')") + public Result get(@PathVariable("id") Long id){ + WoPackagingBoxDTO data = woPackagingBoxService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:save')") + public Result save(@RequestBody WoPackagingBoxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + woPackagingBoxService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:update')") + public Result update(@RequestBody WoPackagingBoxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + woPackagingBoxService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + woPackagingBoxService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woPackagingBoxService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingBoxExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java new file mode 100644 index 0000000..39796ba --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO; +import com.cnbm.generator.code.excel.WoPackagingBoxSubstrateExcel; +import com.cnbm.generator.code.service.WoPackagingBoxSubstrateServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 包装箱基板关联表 ( 基板表 ) 前端控制器 + * + * @author codeGenerator + * @since 2023-02-21 + */ +@RestController +@RequestMapping("/code/woPackagingBoxSubstrate") +@Api(tags="包装箱基板关联表 ( 基板表 )") +public class WoPackagingBoxSubstrateController { + @Autowired + private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = woPackagingBoxSubstrateService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:info')") + public Result get(@PathVariable("id") Long id){ + WoPackagingBoxSubstrateDTO data = woPackagingBoxSubstrateService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:save')") + public Result save(@RequestBody WoPackagingBoxSubstrateDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + woPackagingBoxSubstrateService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:update')") + public Result update(@RequestBody WoPackagingBoxSubstrateDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + woPackagingBoxSubstrateService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + woPackagingBoxSubstrateService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woPackagingBoxSubstrateService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingBoxSubstrateExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingPrintHistoryController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingPrintHistoryController.java new file mode 100644 index 0000000..9404059 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingPrintHistoryController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO; +import com.cnbm.generator.code.excel.WoPackagingPrintHistoryExcel; +import com.cnbm.generator.code.service.WoPackagingPrintHistoryServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 包装箱打印历史表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@RestController +@RequestMapping("/code/woPackagingPrintHistory") +@Api(tags="包装箱打印历史表") +public class WoPackagingPrintHistoryController { + @Autowired + private WoPackagingPrintHistoryServiceBiz woPackagingPrintHistoryService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = woPackagingPrintHistoryService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:info')") + public Result get(@PathVariable("id") Long id){ + WoPackagingPrintHistoryDTO data = woPackagingPrintHistoryService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:save')") + public Result save(@RequestBody WoPackagingPrintHistoryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + woPackagingPrintHistoryService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:update')") + public Result update(@RequestBody WoPackagingPrintHistoryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + woPackagingPrintHistoryService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + woPackagingPrintHistoryService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woPackagingPrintHistoryService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingPrintHistoryExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java new file mode 100644 index 0000000..ca94b5b --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java @@ -0,0 +1,116 @@ +package com.cnbm.generator.code.controller; + +import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.common.constant.Constant; +import com.cnbm.common.page.PageData; +import com.cnbm.common.utils.ExcelUtils; +import com.cnbm.common.utils.Result; +import com.cnbm.common.validator.AssertUtils; +import com.cnbm.common.validator.ValidatorUtils; +import com.cnbm.common.validator.group.AddGroup; +import com.cnbm.common.validator.group.DefaultGroup; +import com.cnbm.common.validator.group.UpdateGroup; +import com.cnbm.generator.code.dto.WoPowerLevelDTO; +import com.cnbm.generator.code.excel.WoPowerLevelExcel; +import com.cnbm.generator.code.service.WoPowerLevelServiceBiz; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 功率等级 表 前端控制器 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@RestController +@RequestMapping("/code/woPowerLevel") +@Api(tags="功率等级 表") +public class WoPowerLevelController { + @Autowired + private WoPowerLevelServiceBiz woPowerLevelService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + }) + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:page')") + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = woPowerLevelService.page(params); + + return new Result>().ok(page); + } + + @GetMapping("{id}") + @ApiOperation("信息") + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:info')") + public Result get(@PathVariable("id") Long id){ + WoPowerLevelDTO data = woPowerLevelService.get(id); + + return new Result().ok(data); + } + + @PostMapping + @ApiOperation("保存") + @LogOperation("保存") + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:save')") + public Result save(@RequestBody WoPowerLevelDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + + woPowerLevelService.save(dto); + + return new Result().ok(dto.getId()); + } + + @PutMapping + @ApiOperation("修改") + @LogOperation("修改") + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:update')") + public Result update(@RequestBody WoPowerLevelDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + + woPowerLevelService.update(dto); + + return new Result().ok(dto.getId()); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:delete')") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + + woPowerLevelService.delete(ids); + + return new Result(); + } + + @GetMapping("export") + @ApiOperation("导出") + @LogOperation("导出") + @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:export')") + public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woPowerLevelService.list(params); + + ExcelUtils.exportExcelToTarget(response, null, list, WoPowerLevelExcel.class); + } + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/ChangePackagingBoxHistoryDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/ChangePackagingBoxHistoryDTO.java new file mode 100644 index 0000000..6c014d1 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/ChangePackagingBoxHistoryDTO.java @@ -0,0 +1,80 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 包装箱拆合箱历史表 + * + * @author codeGenerator + * @since 2023-02-16 + */ +@Data +@ApiModel(value = "包装箱拆合箱历史表DTO对象") +public class ChangePackagingBoxHistoryDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "基板ID或模组id") + private String substrateId; + + @ApiModelProperty(value = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long sourceBoxNo; + + @ApiModelProperty(value = "源箱slot") + private Integer sourceSlot; + + @ApiModelProperty(value = "离开时间") + private LocalDateTime leaveTime; + + @ApiModelProperty(value = "目标箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long targetBoxNo; + + @ApiModelProperty(value = "目标箱slot") + private Integer targetSlot; + + @ApiModelProperty(value = "进入时间") + private LocalDateTime inputTime; + + @ApiModelProperty(value = "等级") + private String grade; + + @ApiModelProperty(value = "类型，1为拆箱，2为合箱") + private Integer type; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java new file mode 100644 index 0000000..7f77aa0 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java @@ -0,0 +1,80 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 打印标签模板表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@ApiModel(value = "打印标签模板表DTO对象") +public class PrintModelDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "编码") + private String code; + + @ApiModelProperty(value = "班组名称") + private String name; + + @ApiModelProperty(value = "启用状态:0 、停用，1、启用") + private Integer enabled; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "类型，0：模组标签，1：等级标签") + private Integer type; + + @ApiModelProperty(value = "是否默认模板，0：否，1：是") + private Integer isDefault; + + @ApiModelProperty(value = "是否要预览，0：否，1：是") + private Integer isPreview; + + @ApiModelProperty(value = "模板内容") + private String content; + + @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoCompensationPowerDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoCompensationPowerDTO.java new file mode 100644 index 0000000..bf6b305 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoCompensationPowerDTO.java @@ -0,0 +1,74 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 基板补偿功率 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@ApiModel(value = "基板补偿功率 表DTO对象") +public class WoCompensationPowerDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppLow; + + @ApiModelProperty(value = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppHigh; + + @ApiModelProperty(value = "计算公式") + private String formula; + + @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + + @ApiModelProperty(value = "系数a,（手动录入）") + private Float coefficientA; + + @ApiModelProperty(value = "系数b,（手动录入）") + private Float coefficientB; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java new file mode 100644 index 0000000..fedf84a --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java @@ -0,0 +1,113 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 包装箱表 + * + * @author codeGenerator + * @since 2023-02-22 + */ +@Data +@ApiModel(value = "包装箱表DTO对象") +public class WoPackagingBoxDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "订单ID") + private Long orderId; + + @ApiModelProperty(value = "工单ID（舍弃啊）") + private Long workOrderId; + + @ApiModelProperty(value = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId") + private String boxNo; + + @ApiModelProperty(value = "功率，单位瓦（舍弃）") + private Integer power; + + @ApiModelProperty(value = "等级（舍弃）") + private Integer grade; + + @ApiModelProperty(value = "基板数量，每个包装箱最大20片（舍弃）") + private Integer substrateQuantity; + + @ApiModelProperty(value = "装箱完成时间，指的是包装完成时间") + private LocalDateTime packagingTime; + + @ApiModelProperty(value = "打印时间（最近一次打印时间）") + private LocalDateTime printTime; + + @ApiModelProperty(value = "打印状态：0、未打印，1、已打印") + private Integer printStatus; + + @ApiModelProperty(value = "报工状态：0、未报工，1、已报工(舍弃)") + private Integer completionReportingStatus; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "离开产线时间（舍弃）") + private LocalDateTime leaveLineTime; + + @ApiModelProperty(value = "下片端口id（舍弃）") + private String portId; + + @ApiModelProperty(value = "打印次数") + private Integer printCount; + + @ApiModelProperty(value = "功率等级") + private String powerLevel; + + @ApiModelProperty(value = "客户id（舍弃）") + private Long customerId; + + @ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + + @ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + + @ApiModelProperty(value = "模式，1-手动模式；2-自动模式") + private Integer model; + + @ApiModelProperty(value = "是否到达包装台，1=到达；2=未达到") + private Integer isArrived; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java new file mode 100644 index 0000000..2e7569f --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java @@ -0,0 +1,74 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 包装箱基板关联表 ( 基板表 ) + * + * @author codeGenerator + * @since 2023-02-21 + */ +@Data +@ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象") +public class WoPackagingBoxSubstrateDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "包装箱ID，BoxId") + private String packagingBoxId; + + @ApiModelProperty(value = "基板ID") + private String woSubstrateId; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "箱中位置") + private Integer slot; + + @ApiModelProperty(value = "进入时间") + private LocalDateTime inputTime; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + + @ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + + @ApiModelProperty(value = "功率等级") + private String powerLevel; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingPrintHistoryDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingPrintHistoryDTO.java new file mode 100644 index 0000000..3250838 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingPrintHistoryDTO.java @@ -0,0 +1,83 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 包装箱打印历史表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@ApiModel(value = "包装箱打印历史表DTO对象") +public class WoPackagingPrintHistoryDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "包装箱编号，关联t_wo_packaging_box.box_no") + private Long boxNo; + + @ApiModelProperty(value = "打印时间") + private LocalDateTime printTime; + + @ApiModelProperty(value = "报工时间（舍弃）") + private LocalDateTime completionReportingTime; + + @ApiModelProperty(value = "打印状态：0、未打印，1、已打印") + private Integer printStatus; + + @ApiModelProperty(value = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）") + private Integer completionReportingStatus; + + @ApiModelProperty(value = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）") + private LocalDateTime leaveLineTime; + + @ApiModelProperty(value = "下片端口id（舍弃）") + private String portId; + + @ApiModelProperty(value = "打印次数") + private Integer printCount; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "模式，1-手动模式；2-自动模式") + private Integer model; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java new file mode 100644 index 0000000..5dd0390 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java @@ -0,0 +1,83 @@ +package com.cnbm.generator.code.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import java.math.BigDecimal; + + +/** + * 功率等级 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@ApiModel(value = "功率等级 表DTO对象") +public class WoPowerLevelDTO implements Serializable { + private static final long serialVersionUID = 1L; + + + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "功率等级名称，（现场人员手动录入）") + private Integer powerClass; + + @ApiModelProperty(value = "pmpp_low,（现场人员手动录入）") + private Float pmppLow; + + @ApiModelProperty(value = "pmpp_high,（现场人员手动录入）") + private Float pmppHigh; + + @ApiModelProperty(value = "物料号,（现场人员手动录入）") + private String sapMaterialNum; + + @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + + @ApiModelProperty(value = "lable_voc,（手动录入）") + private BigDecimal lableVoc; + + @ApiModelProperty(value = "lable_isc,（手动录入）") + private BigDecimal lableIsc; + + @ApiModelProperty(value = "lable_vmpp,（手动录入）") + private BigDecimal lableVmpp; + + @ApiModelProperty(value = "lable_impp,（手动录入）") + private BigDecimal lableImpp; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + + @ApiModelProperty(value = "创建人") + private Long creatorId; + + @ApiModelProperty(value = "创建人姓名") + private String creatorName; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新人") + private Long updaterId; + + @ApiModelProperty(value = "更新人姓名") + private String updaterName; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/ChangePackagingBoxHistory.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/ChangePackagingBoxHistory.java new file mode 100644 index 0000000..d50196c --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/ChangePackagingBoxHistory.java @@ -0,0 +1,118 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 包装箱拆合箱历史表 + *

+ * + * @author codeGenerator + * @since 2023-02-16 + */ +@Data +@TableName("t_change_packaging_box_history") +@ApiModel(value = "ChangePackagingBoxHistory对象", description = "包装箱拆合箱历史表") +public class ChangePackagingBoxHistory implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("基板ID或模组id") + private String substrateId; + + @ApiModelProperty("源包装箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long sourceBoxNo; + + @ApiModelProperty("源箱slot") + private Integer sourceSlot; + + @ApiModelProperty("离开时间") + private LocalDateTime leaveTime; + + @ApiModelProperty("目标箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long targetBoxNo; + + @ApiModelProperty("目标箱slot") + private Integer targetSlot; + + @ApiModelProperty("进入时间") + private LocalDateTime inputTime; + + @ApiModelProperty("等级") + private String grade; + + @ApiModelProperty("类型，1为拆箱，2为合箱") + private Integer type; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + + public static final String ID = "ID"; + + public static final String SUBSTRATE_ID = "SUBSTRATE_ID"; + + public static final String SOURCE_BOX_NO = "SOURCE_BOX_NO"; + + public static final String SOURCE_SLOT = "SOURCE_SLOT"; + + public static final String LEAVE_TIME = "LEAVE_TIME"; + + public static final String TARGET_BOX_NO = "TARGET_BOX_NO"; + + public static final String TARGET_SLOT = "TARGET_SLOT"; + + public static final String INPUT_TIME = "INPUT_TIME"; + + public static final String GRADE = "GRADE"; + + public static final String TYPE = "TYPE"; + + public static final String VALID = "VALID"; + + public static final String CREATOR_ID = "CREATOR_ID"; + + public static final String CREATOR_NAME = "CREATOR_NAME"; + + public static final String CREATE_TIME = "CREATE_TIME"; + + public static final String UPDATER_ID = "UPDATER_ID"; + + public static final String UPDATER_NAME = "UPDATER_NAME"; + + public static final String UPDATE_TIME = "UPDATE_TIME"; + + public static final String VERSION = "VERSION"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java new file mode 100644 index 0000000..58df496 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java @@ -0,0 +1,118 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 打印标签模板表 + *

+ * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@TableName("t_print_model") +@ApiModel(value = "PrintModel对象", description = "打印标签模板表") +public class PrintModel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("编码") + private String code; + + @ApiModelProperty("班组名称") + private String name; + + @ApiModelProperty("启用状态:0 、停用，1、启用") + private Integer enabled; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("类型，0：模组标签，1：等级标签") + private Integer type; + + @ApiModelProperty("是否默认模板，0：否，1：是") + private Integer isDefault; + + @ApiModelProperty("是否要预览，0：否，1：是") + private Integer isPreview; + + @ApiModelProperty("模板内容") + private String content; + + @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + + + public static final String ID = "ID"; + + public static final String CODE = "CODE"; + + public static final String NAME = "NAME"; + + public static final String ENABLED = "ENABLED"; + + public static final String CREATOR_ID = "CREATOR_ID"; + + public static final String CREATOR_NAME = "CREATOR_NAME"; + + public static final String CREATE_TIME = "CREATE_TIME"; + + public static final String UPDATER_ID = "UPDATER_ID"; + + public static final String UPDATER_NAME = "UPDATER_NAME"; + + public static final String UPDATE_TIME = "UPDATE_TIME"; + + public static final String VERSION = "VERSION"; + + public static final String VALID = "VALID"; + + public static final String REMARK = "REMARK"; + + public static final String TYPE = "TYPE"; + + public static final String IS_DEFAULT = "IS_DEFAULT"; + + public static final String IS_PREVIEW = "IS_PREVIEW"; + + public static final String CONTENT = "CONTENT"; + + public static final String LINE_BODY = "line_body"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoCompensationPower.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoCompensationPower.java new file mode 100644 index 0000000..da5805a --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoCompensationPower.java @@ -0,0 +1,108 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 基板补偿功率 表 + *

+ * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@TableName("t_wo_compensation_power") +@ApiModel(value = "WoCompensationPower对象", description = "基板补偿功率 表") +public class WoCompensationPower implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppLow; + + @ApiModelProperty("实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppHigh; + + @ApiModelProperty("计算公式") + private String formula; + + @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + + @ApiModelProperty("系数a,（手动录入）") + private Float coefficientA; + + @ApiModelProperty("系数b,（手动录入）") + private Float coefficientB; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + + public static final String ID = "id"; + + public static final String ACTL_PMPP_LOW = "actl_pmpp_low"; + + public static final String ACTL_PMPP_HIGH = "actl_pmpp_high"; + + public static final String FORMULA = "formula"; + + public static final String LINE_BODY = "line_body"; + + public static final String COEFFICIENT_A = "coefficient_a"; + + public static final String COEFFICIENT_B = "coefficient_b"; + + public static final String REMARK = "remark"; + + public static final String VALID = "valid"; + + public static final String CREATOR_ID = "creator_id"; + + public static final String CREATOR_NAME = "creator_name"; + + public static final String CREATE_TIME = "create_time"; + + public static final String UPDATER_ID = "updater_id"; + + public static final String UPDATER_NAME = "updater_name"; + + public static final String UPDATE_TIME = "update_time"; + + public static final String VERSION = "version"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java new file mode 100644 index 0000000..caed2b2 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java @@ -0,0 +1,173 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 包装箱表 + *

+ * + * @author codeGenerator + * @since 2023-02-22 + */ +@Data +@TableName("t_wo_packaging_box") +@ApiModel(value = "WoPackagingBox对象", description = "包装箱表") +public class WoPackagingBox implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("订单ID") + private Long orderId; + + @ApiModelProperty("工单ID（舍弃啊）") + private Long workOrderId; + + @ApiModelProperty("包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId") + private String boxNo; + + @ApiModelProperty("功率，单位瓦（舍弃）") + private Integer power; + + @ApiModelProperty("等级（舍弃）") + private Integer grade; + + @ApiModelProperty("基板数量，每个包装箱最大20片（舍弃）") + private Integer substrateQuantity; + + @ApiModelProperty("装箱完成时间，指的是包装完成时间") + private LocalDateTime packagingTime; + + @ApiModelProperty("打印时间（最近一次打印时间）") + private LocalDateTime printTime; + + @ApiModelProperty("打印状态：0、未打印，1、已打印") + private Integer printStatus; + + @ApiModelProperty("报工状态：0、未报工，1、已报工(舍弃)") + private Integer completionReportingStatus; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + @ApiModelProperty("离开产线时间（舍弃）") + private LocalDateTime leaveLineTime; + + @ApiModelProperty("下片端口id（舍弃）") + private String portId; + + @ApiModelProperty("打印次数") + private Integer printCount; + + @ApiModelProperty("功率等级") + private String powerLevel; + + @ApiModelProperty("客户id（舍弃）") + private Long customerId; + + @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + + @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + + @ApiModelProperty("模式，1-手动模式；2-自动模式") + private Integer model; + + @ApiModelProperty("是否到达包装台，1=到达；2=未达到") + private Integer isArrived; + + + public static final String ID = "ID"; + + public static final String ORDER_ID = "ORDER_ID"; + + public static final String WORK_ORDER_ID = "WORK_ORDER_ID"; + + public static final String BOX_NO = "BOX_NO"; + + public static final String POWER = "POWER"; + + public static final String GRADE = "GRADE"; + + public static final String SUBSTRATE_QUANTITY = "SUBSTRATE_QUANTITY"; + + public static final String PACKAGING_TIME = "PACKAGING_TIME"; + + public static final String PRINT_TIME = "PRINT_TIME"; + + public static final String PRINT_STATUS = "PRINT_STATUS"; + + public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS"; + + public static final String REMARK = "REMARK"; + + public static final String VALID = "VALID"; + + public static final String CREATOR_ID = "CREATOR_ID"; + + public static final String CREATOR_NAME = "CREATOR_NAME"; + + public static final String CREATE_TIME = "CREATE_TIME"; + + public static final String UPDATER_ID = "UPDATER_ID"; + + public static final String UPDATER_NAME = "UPDATER_NAME"; + + public static final String UPDATE_TIME = "UPDATE_TIME"; + + public static final String VERSION = "VERSION"; + + public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME"; + + public static final String PORT_ID = "PORT_ID"; + + public static final String PRINT_COUNT = "PRINT_COUNT"; + + public static final String POWER_LEVEL = "POWER_LEVEL"; + + public static final String CUSTOMER_ID = "CUSTOMER_ID"; + + public static final String SAP_MATERIAL = "SAP_MATERIAL"; + + public static final String LINE_BODY = "LINE_BODY"; + + public static final String MODEL = "model"; + + public static final String IS_ARRIVED = "is_arrived"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java new file mode 100644 index 0000000..da3c388 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java @@ -0,0 +1,108 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 包装箱基板关联表 ( 基板表 ) + *

+ * + * @author codeGenerator + * @since 2023-02-21 + */ +@Data +@TableName("t_wo_packaging_box_substrate") +@ApiModel(value = "WoPackagingBoxSubstrate对象", description = "包装箱基板关联表 ( 基板表 )") +public class WoPackagingBoxSubstrate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("包装箱ID，BoxId") + private String packagingBoxId; + + @ApiModelProperty("基板ID") + private String woSubstrateId; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + @ApiModelProperty("箱中位置") + private Integer slot; + + @ApiModelProperty("进入时间") + private LocalDateTime inputTime; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + + @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + + @ApiModelProperty("功率等级") + private String powerLevel; + + + public static final String ID = "ID"; + + public static final String PACKAGING_BOX_ID = "PACKAGING_BOX_ID"; + + public static final String WO_SUBSTRATE_ID = "WO_SUBSTRATE_ID"; + + public static final String CREATOR_ID = "CREATOR_ID"; + + public static final String CREATOR_NAME = "CREATOR_NAME"; + + public static final String CREATE_TIME = "CREATE_TIME"; + + public static final String UPDATER_ID = "UPDATER_ID"; + + public static final String UPDATER_NAME = "UPDATER_NAME"; + + public static final String UPDATE_TIME = "UPDATE_TIME"; + + public static final String VERSION = "VERSION"; + + public static final String SLOT = "SLOT"; + + public static final String INPUT_TIME = "INPUT_TIME"; + + public static final String VALID = "VALID"; + + public static final String SAP_MATERIAL = "SAP_MATERIAL"; + + public static final String LINE_BODY = "LINE_BODY"; + + public static final String POWER_LEVEL = "POWER_LEVEL"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingPrintHistory.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingPrintHistory.java new file mode 100644 index 0000000..61069fc --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingPrintHistory.java @@ -0,0 +1,123 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 包装箱打印历史表 + *

+ * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@TableName("t_wo_packaging_print_history") +@ApiModel(value = "WoPackagingPrintHistory对象", description = "包装箱打印历史表") +public class WoPackagingPrintHistory implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("包装箱编号，关联t_wo_packaging_box.box_no") + private Long boxNo; + + @ApiModelProperty("打印时间") + private LocalDateTime printTime; + + @ApiModelProperty("报工时间（舍弃）") + private LocalDateTime completionReportingTime; + + @ApiModelProperty("打印状态：0、未打印，1、已打印") + private Integer printStatus; + + @ApiModelProperty("报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）") + private Integer completionReportingStatus; + + @ApiModelProperty("移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）") + private LocalDateTime leaveLineTime; + + @ApiModelProperty("下片端口id（舍弃）") + private String portId; + + @ApiModelProperty("打印次数") + private Integer printCount; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("模式，1-手动模式；2-自动模式") + private Integer model; + + + public static final String ID = "ID"; + + public static final String BOX_NO = "BOX_NO"; + + public static final String PRINT_TIME = "PRINT_TIME"; + + public static final String COMPLETION_REPORTING_TIME = "COMPLETION_REPORTING_TIME"; + + public static final String PRINT_STATUS = "PRINT_STATUS"; + + public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS"; + + public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME"; + + public static final String PORT_ID = "PORT_ID"; + + public static final String PRINT_COUNT = "PRINT_COUNT"; + + public static final String VALID = "VALID"; + + public static final String CREATOR_ID = "CREATOR_ID"; + + public static final String CREATOR_NAME = "CREATOR_NAME"; + + public static final String CREATE_TIME = "CREATE_TIME"; + + public static final String UPDATER_ID = "UPDATER_ID"; + + public static final String UPDATER_NAME = "UPDATER_NAME"; + + public static final String UPDATE_TIME = "UPDATE_TIME"; + + public static final String VERSION = "VERSION"; + + public static final String REMARK = "REMARK"; + + public static final String MODEL = "model"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java new file mode 100644 index 0000000..6b81412 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java @@ -0,0 +1,124 @@ +package com.cnbm.generator.code.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 功率等级 表 + *

+ * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +@TableName("t_wo_power_level") +@ApiModel(value = "WoPowerLevel对象", description = "功率等级 表") +public class WoPowerLevel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("功率等级名称，（现场人员手动录入）") + private Integer powerClass; + + @ApiModelProperty("pmpp_low,（现场人员手动录入）") + private Float pmppLow; + + @ApiModelProperty("pmpp_high,（现场人员手动录入）") + private Float pmppHigh; + + @ApiModelProperty("物料号,（现场人员手动录入）") + private String sapMaterialNum; + + @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + + @ApiModelProperty("lable_voc,（手动录入）") + private BigDecimal lableVoc; + + @ApiModelProperty("lable_isc,（手动录入）") + private BigDecimal lableIsc; + + @ApiModelProperty("lable_vmpp,（手动录入）") + private BigDecimal lableVmpp; + + @ApiModelProperty("lable_impp,（手动录入）") + private BigDecimal lableImpp; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("删除标志，是否有效:1 可用 0不可用") + @TableLogic + private Integer valid; + + @ApiModelProperty("创建人") + private Long creatorId; + + @ApiModelProperty("创建人姓名") + private String creatorName; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新人") + private Long updaterId; + + @ApiModelProperty("更新人姓名") + private String updaterName; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("版本号") + private Integer version; + + + public static final String ID = "id"; + + public static final String POWER_CLASS = "power_class"; + + public static final String PMPP_LOW = "pmpp_low"; + + public static final String PMPP_HIGH = "pmpp_high"; + + public static final String SAP_MATERIAL_NUM = "sap_material_num"; + + public static final String LINE_BODY = "line_body"; + + public static final String LABLE_VOC = "lable_voc"; + + public static final String LABLE_ISC = "lable_isc"; + + public static final String LABLE_VMPP = "lable_vmpp"; + + public static final String LABLE_IMPP = "lable_impp"; + + public static final String REMARK = "remark"; + + public static final String VALID = "valid"; + + public static final String CREATOR_ID = "creator_id"; + + public static final String CREATOR_NAME = "creator_name"; + + public static final String CREATE_TIME = "create_time"; + + public static final String UPDATER_ID = "updater_id"; + + public static final String UPDATER_NAME = "updater_name"; + + public static final String UPDATE_TIME = "update_time"; + + public static final String VERSION = "version"; + +} diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/ChangePackagingBoxHistoryExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/ChangePackagingBoxHistoryExcel.java new file mode 100644 index 0000000..595b11a --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/ChangePackagingBoxHistoryExcel.java @@ -0,0 +1,56 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 包装箱拆合箱历史表 + * + * @author codeGenerator + * @since 2023-02-16 + */ +@Data +public class ChangePackagingBoxHistoryExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "基板ID或模组id") + private String substrateId; + @Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long sourceBoxNo; + @Excel(name = "源箱slot") + private Integer sourceSlot; + @Excel(name = "离开时间") + private LocalDateTime leaveTime; + @Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段") + private Long targetBoxNo; + @Excel(name = "目标箱slot") + private Integer targetSlot; + @Excel(name = "进入时间") + private LocalDateTime inputTime; + @Excel(name = "等级") + private String grade; + @Excel(name = "类型，1为拆箱，2为合箱") + private Integer type; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java new file mode 100644 index 0000000..77d623d --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java @@ -0,0 +1,56 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 打印标签模板表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +public class PrintModelExcel { + @Excel(name = "id") + private Long id; + @Excel(name = "编码") + private String code; + @Excel(name = "班组名称") + private String name; + @Excel(name = "启用状态:0 、停用，1、启用") + private Integer enabled; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "备注") + private String remark; + @Excel(name = "类型，0：模组标签，1：等级标签") + private Integer type; + @Excel(name = "是否默认模板，0：否，1：是") + private Integer isDefault; + @Excel(name = "是否要预览，0：否，1：是") + private Integer isPreview; + @Excel(name = "模板内容") + private String content; + @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoCompensationPowerExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoCompensationPowerExcel.java new file mode 100644 index 0000000..5a5be5f --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoCompensationPowerExcel.java @@ -0,0 +1,52 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 基板补偿功率 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +public class WoCompensationPowerExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppLow; + @Excel(name = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率") + private Float actlPmppHigh; + @Excel(name = "计算公式") + private String formula; + @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + @Excel(name = "系数a,（手动录入）") + private Float coefficientA; + @Excel(name = "系数b,（手动录入）") + private Float coefficientB; + @Excel(name = "备注") + private String remark; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java new file mode 100644 index 0000000..83a31bb --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java @@ -0,0 +1,78 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 包装箱表 + * + * @author codeGenerator + * @since 2023-02-22 + */ +@Data +public class WoPackagingBoxExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "订单ID") + private Long orderId; + @Excel(name = "工单ID（舍弃啊）") + private Long workOrderId; + @Excel(name = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId") + private String boxNo; + @Excel(name = "功率，单位瓦（舍弃）") + private Integer power; + @Excel(name = "等级（舍弃）") + private Integer grade; + @Excel(name = "基板数量，每个包装箱最大20片（舍弃）") + private Integer substrateQuantity; + @Excel(name = "装箱完成时间，指的是包装完成时间") + private LocalDateTime packagingTime; + @Excel(name = "打印时间（最近一次打印时间）") + private LocalDateTime printTime; + @Excel(name = "打印状态：0、未打印，1、已打印") + private Integer printStatus; + @Excel(name = "报工状态：0、未报工，1、已报工(舍弃)") + private Integer completionReportingStatus; + @Excel(name = "备注") + private String remark; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + @Excel(name = "离开产线时间（舍弃）") + private LocalDateTime leaveLineTime; + @Excel(name = "下片端口id（舍弃）") + private String portId; + @Excel(name = "打印次数") + private Integer printCount; + @Excel(name = "功率等级") + private String powerLevel; + @Excel(name = "客户id（舍弃）") + private Long customerId; + @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + @Excel(name = "模式，1-手动模式；2-自动模式") + private Integer model; + @Excel(name = "是否到达包装台，1=到达；2=未达到") + private Integer isArrived; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java new file mode 100644 index 0000000..c2758ae --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java @@ -0,0 +1,52 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 包装箱基板关联表 ( 基板表 ) + * + * @author codeGenerator + * @since 2023-02-21 + */ +@Data +public class WoPackagingBoxSubstrateExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "包装箱ID，BoxId") + private String packagingBoxId; + @Excel(name = "基板ID") + private String woSubstrateId; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + @Excel(name = "箱中位置") + private Integer slot; + @Excel(name = "进入时间") + private LocalDateTime inputTime; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的") + private String sapMaterial; + @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S") + private Integer lineBody; + @Excel(name = "功率等级") + private String powerLevel; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingPrintHistoryExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingPrintHistoryExcel.java new file mode 100644 index 0000000..b0c295e --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingPrintHistoryExcel.java @@ -0,0 +1,58 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 包装箱打印历史表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +public class WoPackagingPrintHistoryExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "包装箱编号，关联t_wo_packaging_box.box_no") + private Long boxNo; + @Excel(name = "打印时间") + private LocalDateTime printTime; + @Excel(name = "报工时间（舍弃）") + private LocalDateTime completionReportingTime; + @Excel(name = "打印状态：0、未打印，1、已打印") + private Integer printStatus; + @Excel(name = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）") + private Integer completionReportingStatus; + @Excel(name = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）") + private LocalDateTime leaveLineTime; + @Excel(name = "下片端口id（舍弃）") + private String portId; + @Excel(name = "打印次数") + private Integer printCount; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + @Excel(name = "备注") + private String remark; + @Excel(name = "模式，1-手动模式；2-自动模式") + private Integer model; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java new file mode 100644 index 0000000..6dd56ea --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java @@ -0,0 +1,58 @@ +package com.cnbm.generator.code.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.time.LocalDateTime; +import java.math.BigDecimal; + +import java.util.Date; + +/** + * 功率等级 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Data +public class WoPowerLevelExcel { + @Excel(name = "ID") + private Long id; + @Excel(name = "功率等级名称，（现场人员手动录入）") + private Integer powerClass; + @Excel(name = "pmpp_low,（现场人员手动录入）") + private Float pmppLow; + @Excel(name = "pmpp_high,（现场人员手动录入）") + private Float pmppHigh; + @Excel(name = "物料号,（现场人员手动录入）") + private String sapMaterialNum; + @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + private Integer lineBody; + @Excel(name = "lable_voc,（手动录入）") + private BigDecimal lableVoc; + @Excel(name = "lable_isc,（手动录入）") + private BigDecimal lableIsc; + @Excel(name = "lable_vmpp,（手动录入）") + private BigDecimal lableVmpp; + @Excel(name = "lable_impp,（手动录入）") + private BigDecimal lableImpp; + @Excel(name = "备注") + private String remark; + @Excel(name = "删除标志，是否有效:1 可用 0不可用") + private Integer valid; + @Excel(name = "创建人") + private Long creatorId; + @Excel(name = "创建人姓名") + private String creatorName; + @Excel(name = "创建时间") + private LocalDateTime createTime; + @Excel(name = "更新人") + private Long updaterId; + @Excel(name = "更新人姓名") + private String updaterName; + @Excel(name = "更新时间") + private LocalDateTime updateTime; + @Excel(name = "版本号") + private Integer version; + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.java new file mode 100644 index 0000000..5e70382 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.ChangePackagingBoxHistory; +import org.apache.ibatis.annotations.Mapper; + +/** + * 包装箱拆合箱历史表 + * + * @author codeGenerator + * @since 2023-02-16 + */ +@Mapper +public interface ChangePackagingBoxHistoryMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.xml new file mode 100644 index 0000000..1e6c502 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java new file mode 100644 index 0000000..92a6750 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.PrintModel; +import org.apache.ibatis.annotations.Mapper; + +/** + * 打印标签模板表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Mapper +public interface PrintModelMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml new file mode 100644 index 0000000..8092e8a --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.java new file mode 100644 index 0000000..fb77586 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.WoCompensationPower; +import org.apache.ibatis.annotations.Mapper; + +/** + * 基板补偿功率 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Mapper +public interface WoCompensationPowerMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.xml new file mode 100644 index 0000000..f0b8ec4 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java new file mode 100644 index 0000000..ca1bf93 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.WoPackagingBox; +import org.apache.ibatis.annotations.Mapper; + +/** + * 包装箱表 + * + * @author codeGenerator + * @since 2023-02-22 + */ +@Mapper +public interface WoPackagingBoxMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml new file mode 100644 index 0000000..b96704f --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java new file mode 100644 index 0000000..59c2fee --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate; +import org.apache.ibatis.annotations.Mapper; + +/** + * 包装箱基板关联表 ( 基板表 ) + * + * @author codeGenerator + * @since 2023-02-21 + */ +@Mapper +public interface WoPackagingBoxSubstrateMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml new file mode 100644 index 0000000..61a5420 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.java new file mode 100644 index 0000000..dd20d33 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.WoPackagingPrintHistory; +import org.apache.ibatis.annotations.Mapper; + +/** + * 包装箱打印历史表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Mapper +public interface WoPackagingPrintHistoryMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.xml new file mode 100644 index 0000000..c665a18 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java new file mode 100644 index 0000000..b546272 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java @@ -0,0 +1,16 @@ +package com.cnbm.generator.code.mapper; + +import com.cnbm.common.dao.BaseDao; +import com.cnbm.generator.code.entity.WoPowerLevel; +import org.apache.ibatis.annotations.Mapper; + +/** + * 功率等级 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Mapper +public interface WoPowerLevelMapper extends BaseDao { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.xml new file mode 100644 index 0000000..9ba016c --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/ChangePackagingBoxHistorymysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/ChangePackagingBoxHistorymysql.sql new file mode 100644 index 0000000..97b067d --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/ChangePackagingBoxHistorymysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1626059890161434625, 1067246875800000035, '包装箱拆合箱历史表', 'packing/changePackagingBoxHistory', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434626, 1626059890161434625, '查看', NULL, 'packing:changePackagingBoxHistory:page,packing:changePackagingBoxHistory:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434627, 1626059890161434625, '新增', NULL, 'packing:changePackagingBoxHistory:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434628, 1626059890161434625, '修改', NULL, 'packing:changePackagingBoxHistory:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434629, 1626059890161434625, '删除', NULL, 'packing:changePackagingBoxHistory:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434630, 1626059890161434625, '导出', NULL, 'packing:changePackagingBoxHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql new file mode 100644 index 0000000..ca99f9c --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627506543435272194, 1067246875800000035, '打印标签模板表', 'packing/printModel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627506543435272195, 1627506543435272194, '查看', NULL, 'packing:printModel:page,packing:printModel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627506543435272196, 1627506543435272194, '新增', NULL, 'packing:printModel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627506543435272197, 1627506543435272194, '修改', NULL, 'packing:printModel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627506543435272198, 1627506543435272194, '删除', NULL, 'packing:printModel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627506543435272199, 1627506543435272194, '导出', NULL, 'packing:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoCompensationPowermysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoCompensationPowermysql.sql new file mode 100644 index 0000000..1fbf67a --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoCompensationPowermysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627488175458189314, 1067246875800000035, '基板补偿功率 表', 'packing/woCompensationPower', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189315, 1627488175458189314, '查看', NULL, 'packing:woCompensationPower:page,packing:woCompensationPower:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189316, 1627488175458189314, '新增', NULL, 'packing:woCompensationPower:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189317, 1627488175458189314, '修改', NULL, 'packing:woCompensationPower:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189318, 1627488175458189314, '删除', NULL, 'packing:woCompensationPower:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189319, 1627488175458189314, '导出', NULL, 'packing:woCompensationPower:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql new file mode 100644 index 0000000..f3b3d2f --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627855073022648322, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'packing/woPackagingBoxSubstrate', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627855073022648323, 1627855073022648322, '查看', NULL, 'packing:woPackagingBoxSubstrate:page,packing:woPackagingBoxSubstrate:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627855073022648324, 1627855073022648322, '新增', NULL, 'packing:woPackagingBoxSubstrate:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627855073022648325, 1627855073022648322, '修改', NULL, 'packing:woPackagingBoxSubstrate:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627855073022648326, 1627855073022648322, '删除', NULL, 'packing:woPackagingBoxSubstrate:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627855073022648327, 1627855073022648322, '导出', NULL, 'packing:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql new file mode 100644 index 0000000..fbc5955 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628230581925277697, 1067246875800000035, '包装箱表', 'code/woPackagingBox', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628230581925277698, 1628230581925277697, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628230581925277699, 1628230581925277697, '新增', NULL, 'code:woPackagingBox:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628230581925277700, 1628230581925277697, '修改', NULL, 'code:woPackagingBox:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628230581925277701, 1628230581925277697, '删除', NULL, 'code:woPackagingBox:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628230581925277702, 1628230581925277697, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingPrintHistorymysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingPrintHistorymysql.sql new file mode 100644 index 0000000..6eecc68 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingPrintHistorymysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627603723110080513, 1067246875800000035, '包装箱打印历史表', 'packing/woPackagingPrintHistory', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080514, 1627603723110080513, '查看', NULL, 'packing:woPackagingPrintHistory:page,packing:woPackagingPrintHistory:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080515, 1627603723110080513, '新增', NULL, 'packing:woPackagingPrintHistory:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080516, 1627603723110080513, '修改', NULL, 'packing:woPackagingPrintHistory:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080517, 1627603723110080513, '删除', NULL, 'packing:woPackagingPrintHistory:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080518, 1627603723110080513, '导出', NULL, 'packing:woPackagingPrintHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql new file mode 100644 index 0000000..e499d43 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql @@ -0,0 +1,7 @@ +-- 菜单初始SQL +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627486255993688065, 1067246875800000035, '功率等级 表', 'packing/woPowerLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688066, 1627486255993688065, '查看', NULL, 'packing:woPowerLevel:page,packing:woPowerLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688067, 1627486255993688065, '新增', NULL, 'packing:woPowerLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688068, 1627486255993688065, '修改', NULL, 'packing:woPowerLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688069, 1627486255993688065, '删除', NULL, 'packing:woPowerLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688070, 1627486255993688065, '导出', NULL, 'packing:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/ChangePackagingBoxHistoryServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/ChangePackagingBoxHistoryServiceBiz.java new file mode 100644 index 0000000..f539429 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/ChangePackagingBoxHistoryServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO; +import com.cnbm.generator.code.entity.ChangePackagingBoxHistory; + +/** + * 包装箱拆合箱历史表 + * + * @author codeGenerator + * @since 2023-02-16 + */ +public interface ChangePackagingBoxHistoryServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java new file mode 100644 index 0000000..94f931e --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/PrintModelServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.PrintModelDTO; +import com.cnbm.generator.code.entity.PrintModel; + +/** + * 打印标签模板表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +public interface PrintModelServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoCompensationPowerServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoCompensationPowerServiceBiz.java new file mode 100644 index 0000000..f44a7c6 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoCompensationPowerServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.WoCompensationPowerDTO; +import com.cnbm.generator.code.entity.WoCompensationPower; + +/** + * 基板补偿功率 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +public interface WoCompensationPowerServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java new file mode 100644 index 0000000..bc7e126 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.WoPackagingBoxDTO; +import com.cnbm.generator.code.entity.WoPackagingBox; + +/** + * 包装箱表 + * + * @author codeGenerator + * @since 2023-02-22 + */ +public interface WoPackagingBoxServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxSubstrateServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxSubstrateServiceBiz.java new file mode 100644 index 0000000..c945274 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxSubstrateServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO; +import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate; + +/** + * 包装箱基板关联表 ( 基板表 ) + * + * @author codeGenerator + * @since 2023-02-21 + */ +public interface WoPackagingBoxSubstrateServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingPrintHistoryServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingPrintHistoryServiceBiz.java new file mode 100644 index 0000000..00444b8 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingPrintHistoryServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO; +import com.cnbm.generator.code.entity.WoPackagingPrintHistory; + +/** + * 包装箱打印历史表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +public interface WoPackagingPrintHistoryServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java new file mode 100644 index 0000000..9aee212 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java @@ -0,0 +1,15 @@ +package com.cnbm.generator.code.service; + +import com.cnbm.common.service.CrudService; +import com.cnbm.generator.code.dto.WoPowerLevelDTO; +import com.cnbm.generator.code.entity.WoPowerLevel; + +/** + * 功率等级 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +public interface WoPowerLevelServiceBiz extends CrudService { + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java new file mode 100644 index 0000000..24ed42d --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO; +import com.cnbm.generator.code.mapper.ChangePackagingBoxHistoryMapper; +import com.cnbm.generator.code.entity.ChangePackagingBoxHistory; +import com.cnbm.generator.code.service.ChangePackagingBoxHistoryServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 包装箱拆合箱历史表 + * + * @author codeGenerator + * @since 2023-02-16 + */ +@Service +public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl implements ChangePackagingBoxHistoryServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java new file mode 100644 index 0000000..68291b6 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/PrintModelServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.PrintModelDTO; +import com.cnbm.generator.code.mapper.PrintModelMapper; +import com.cnbm.generator.code.entity.PrintModel; +import com.cnbm.generator.code.service.PrintModelServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 打印标签模板表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Service +public class PrintModelServiceBizImpl extends CrudServiceImpl implements PrintModelServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoCompensationPowerServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoCompensationPowerServiceBizImpl.java new file mode 100644 index 0000000..d27edd1 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoCompensationPowerServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.WoCompensationPowerDTO; +import com.cnbm.generator.code.mapper.WoCompensationPowerMapper; +import com.cnbm.generator.code.entity.WoCompensationPower; +import com.cnbm.generator.code.service.WoCompensationPowerServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 基板补偿功率 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Service +public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl implements WoCompensationPowerServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java new file mode 100644 index 0000000..9a742c7 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.WoPackagingBoxDTO; +import com.cnbm.generator.code.mapper.WoPackagingBoxMapper; +import com.cnbm.generator.code.entity.WoPackagingBox; +import com.cnbm.generator.code.service.WoPackagingBoxServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 包装箱表 + * + * @author codeGenerator + * @since 2023-02-22 + */ +@Service +public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl implements WoPackagingBoxServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java new file mode 100644 index 0000000..93af080 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO; +import com.cnbm.generator.code.mapper.WoPackagingBoxSubstrateMapper; +import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate; +import com.cnbm.generator.code.service.WoPackagingBoxSubstrateServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 包装箱基板关联表 ( 基板表 ) + * + * @author codeGenerator + * @since 2023-02-21 + */ +@Service +public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl implements WoPackagingBoxSubstrateServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingPrintHistoryServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingPrintHistoryServiceBizImpl.java new file mode 100644 index 0000000..f16e50b --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingPrintHistoryServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO; +import com.cnbm.generator.code.mapper.WoPackagingPrintHistoryMapper; +import com.cnbm.generator.code.entity.WoPackagingPrintHistory; +import com.cnbm.generator.code.service.WoPackagingPrintHistoryServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 包装箱打印历史表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Service +public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl implements WoPackagingPrintHistoryServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java new file mode 100644 index 0000000..7f572b9 --- /dev/null +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java @@ -0,0 +1,34 @@ +package com.cnbm.generator.code.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cnbm.common.service.impl.CrudServiceImpl; +import com.cnbm.generator.code.dto.WoPowerLevelDTO; +import com.cnbm.generator.code.mapper.WoPowerLevelMapper; +import com.cnbm.generator.code.entity.WoPowerLevel; +import com.cnbm.generator.code.service.WoPowerLevelServiceBiz; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 功率等级 表 + * + * @author codeGenerator + * @since 2023-02-20 + */ +@Service +public class WoPowerLevelServiceBizImpl extends CrudServiceImpl implements WoPowerLevelServiceBiz { + + @Override + public QueryWrapper getWrapper(Map params){ + String id = (String)params.get("id"); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), "id", id); + + return wrapper; + } + + +} \ No newline at end of file diff --git a/ym-packing/pom.xml b/ym-packing/pom.xml index f2001c9..9b736f2 100644 --- a/ym-packing/pom.xml +++ b/ym-packing/pom.xml @@ -23,11 +23,6 @@ ym-common 1.0-SNAPSHOT - - com.cnbm - ym-core - 1.0-SNAPSHOT - org.springframework.security spring-security-core From 7a6fffbf214178d355ec5ec7aa520043db38732a Mon Sep 17 00:00:00 2001 From: yanyang Date: Wed, 22 Feb 2023 20:45:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?class=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ym-gateway/src/main/resources/application.yml | 2 +- .../code/controller/WoPowerLevelController.java | 2 +- .../generator/code/dto/WoPowerLevelDTO.java | 6 +++--- .../generator/code/entity/WoPowerLevel.java | 6 +++--- .../generator/code/excel/WoPowerLevelExcel.java | 6 +++--- .../code/mapper/WoPowerLevelMapper.java | 2 +- .../generator/code/mysql/WoPowerLevelmysql.sql | 12 ++++++------ .../code/service/WoPowerLevelServiceBiz.java | 2 +- .../impl/WoPowerLevelServiceBizImpl.java | 2 +- .../controller/PrintModelController.java | 17 +++++++++-------- .../com/cnbm/packing/dto/WoPowerLevelDTO.java | 2 +- .../com/cnbm/packing/entity/WoPowerLevel.java | 2 +- .../cnbm/packing/excel/WoPowerLevelExcel.java | 2 +- 13 files changed, 32 insertions(+), 31 deletions(-) diff --git a/ym-gateway/src/main/resources/application.yml b/ym-gateway/src/main/resources/application.yml index e2a1db0..4bd8c39 100644 --- a/ym-gateway/src/main/resources/application.yml +++ b/ym-gateway/src/main/resources/application.yml @@ -33,7 +33,7 @@ spring: enabled: true redis: database: 6 - host: redis.picaiba.com + host: 192.168.0.135 port: 6380 password: '@WSXcde3' # 密码（默认为空） timeout: 6000ms # 连接超时时长（毫秒） diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java index ca94b5b..66bcd0d 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java @@ -31,7 +31,7 @@ import java.util.Map; * 功率等级 表 前端控制器 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @RestController @RequestMapping("/code/woPowerLevel") diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java index 5dd0390..2681b17 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; * 功率等级 表 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @Data @ApiModel(value = "功率等级 表DTO对象") @@ -27,7 +27,7 @@ public class WoPowerLevelDTO implements Serializable { private Long id; @ApiModelProperty(value = "功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @ApiModelProperty(value = "pmpp_low,（现场人员手动录入）") private Float pmppLow; @@ -38,7 +38,7 @@ public class WoPowerLevelDTO implements Serializable { @ApiModelProperty(value = "物料号,（现场人员手动录入）") private String sapMaterialNum; - @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）") private Integer lineBody; @ApiModelProperty(value = "lable_voc,（手动录入）") diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java index 6b81412..2f0491c 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java @@ -15,7 +15,7 @@ import lombok.Data; *

* * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @Data @TableName("t_wo_power_level") @@ -28,7 +28,7 @@ public class WoPowerLevel implements Serializable { private Long id; @ApiModelProperty("功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @ApiModelProperty("pmpp_low,（现场人员手动录入）") private Float pmppLow; @@ -39,7 +39,7 @@ public class WoPowerLevel implements Serializable { @ApiModelProperty("物料号,（现场人员手动录入）") private String sapMaterialNum; - @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）") private Integer lineBody; @ApiModelProperty("lable_voc,（手动录入）") diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java index 6dd56ea..d2965e2 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java @@ -12,21 +12,21 @@ import java.util.Date; * 功率等级 表 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @Data public class WoPowerLevelExcel { @Excel(name = "ID") private Long id; @Excel(name = "功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @Excel(name = "pmpp_low,（现场人员手动录入）") private Float pmppLow; @Excel(name = "pmpp_high,（现场人员手动录入）") private Float pmppHigh; @Excel(name = "物料号,（现场人员手动录入）") private String sapMaterialNum; - @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") + @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）") private Integer lineBody; @Excel(name = "lable_voc,（手动录入）") private BigDecimal lableVoc; diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java index b546272..c422dc7 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 功率等级 表 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @Mapper public interface WoPowerLevelMapper extends BaseDao { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql index e499d43..e6c6b03 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql +++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql @@ -1,7 +1,7 @@ -- 菜单初始SQL -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627486255993688065, 1067246875800000035, '功率等级 表', 'packing/woPowerLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688066, 1627486255993688065, '查看', NULL, 'packing:woPowerLevel:page,packing:woPowerLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688067, 1627486255993688065, '新增', NULL, 'packing:woPowerLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688068, 1627486255993688065, '修改', NULL, 'packing:woPowerLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688069, 1627486255993688065, '删除', NULL, 'packing:woPowerLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); -INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627486255993688070, 1627486255993688065, '导出', NULL, 'packing:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628374086450421761, 1067246875800000035, '功率等级 表', 'code/woPowerLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628374086450421762, 1628374086450421761, '查看', NULL, 'code:woPowerLevel:page,code:woPowerLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628374086450421763, 1628374086450421761, '新增', NULL, 'code:woPowerLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628374086450421764, 1628374086450421761, '修改', NULL, 'code:woPowerLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628374086450421765, 1628374086450421761, '删除', NULL, 'code:woPowerLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); +INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628374086450421766, 1628374086450421761, '导出', NULL, 'code:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java index 9aee212..03fba04 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java @@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WoPowerLevel; * 功率等级 表 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ public interface WoPowerLevelServiceBiz extends CrudService { diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java index 7f572b9..5ecedb8 100644 --- a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java +++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java @@ -15,7 +15,7 @@ import java.util.Map; * 功率等级 表 * * @author codeGenerator - * @since 2023-02-20 + * @since 2023-02-22 */ @Service public class WoPowerLevelServiceBizImpl extends CrudServiceImpl implements WoPowerLevelServiceBiz { diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java index 7a39094..79a2550 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java @@ -1,6 +1,7 @@ package com.cnbm.packing.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.utils.CodeGeneratorHelper; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -68,7 +69,7 @@ public class PrintModelController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") +// @LogOperation("保存") // @PreAuthorize("@ex.hasAuthority('packing:printModel:save')") public Result save(@RequestBody PrintModelDTO dto){ //效验数据 @@ -116,16 +117,16 @@ public class PrintModelController { } @PostMapping(value = "list") - @ApiOperation(value = "获取班组列表") - @LogOperation("获取班组列表") + @ApiOperation(value = "获取打印标签模板列表") +// @LogOperation("获取打印标签模板列表") public List list() { return printModelService.list(); } - @PostMapping(value = "get-packing") + @PostMapping(value = "getCode") @ApiOperation(value = "获取标签编码") - @LogOperation("获取标签编码") - private Result getCode() { - String packing = printModelService.getCode(); - return new Result().ok(packing); +// @LogOperation("获取标签编码") + public Result getCode() { + String code = printModelService.getCode(); + return new Result().ok(code); } } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java index 991004c..47bec66 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java +++ b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java @@ -27,7 +27,7 @@ public class WoPowerLevelDTO implements Serializable { private Long id; @ApiModelProperty(value = "功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @ApiModelProperty(value = "pmpp_low,（现场人员手动录入）") private Float pmppLow; diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPowerLevel.java b/ym-packing/src/main/java/com/cnbm/packing/entity/WoPowerLevel.java index 6a453a1..3b0046b 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPowerLevel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/entity/WoPowerLevel.java @@ -28,7 +28,7 @@ public class WoPowerLevel implements Serializable { private Long id; @ApiModelProperty("功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @ApiModelProperty("pmpp_low,（现场人员手动录入）") private Float pmppLow; diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPowerLevelExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPowerLevelExcel.java index 2b46d13..4982d44 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPowerLevelExcel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPowerLevelExcel.java @@ -19,7 +19,7 @@ public class WoPowerLevelExcel { @Excel(name = "ID") private Long id; @Excel(name = "功率等级名称，（现场人员手动录入）") - private Integer powerClass; + private String powerClass; @Excel(name = "pmpp_low,（现场人员手动录入）") private Float pmppLow; @Excel(name = "pmpp_high,（现场人员手动录入）")