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,（现场人员手动录入）")