CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'class字段' (#3) from yanyang into master

Browse Source 
Reviewed-on: #3
This commit is contained in:
闫阳 2023-02-22 20:46:42 +08:00
commit d853cb8409
13 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-gateway/src/main/resources/application.yml
View File

@ -33,7 +33,7 @@ spring:
enabled: true enabled: true
redis: redis:
database: 6 database: 6
host: redis.picaiba.com host: 192.168.0.135
port: 6380 port: 6380
password: '@WSXcde3' # 密码（默认为空） password: '@WSXcde3' # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）

2
ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 功率等级 表 前端控制器 * 功率等级 表 前端控制器
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@RestController @RestController
@RequestMapping("/code/woPowerLevel") @RequestMapping("/code/woPowerLevel")

6
ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 功率等级 表 * 功率等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@Data @Data
@ApiModel(value = "功率等级 表DTO对象") @ApiModel(value = "功率等级 表DTO对象")
@ -27,7 +27,7 @@ public class WoPowerLevelDTO implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）") @ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）") @ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;
@ -38,7 +38,7 @@ public class WoPowerLevelDTO implements Serializable {
@ApiModelProperty(value = "物料号,（现场人员手动录入）") @ApiModelProperty(value = "物料号,（现场人员手动录入）")
private String sapMaterialNum; private String sapMaterialNum;
@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") @ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
private Integer lineBody; private Integer lineBody;
@ApiModelProperty(value = "lable_voc,（手动录入）") @ApiModelProperty(value = "lable_voc,（手动录入）")

6
ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java
View File

@ -15,7 +15,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@Data @Data
@TableName("t_wo_power_level") @TableName("t_wo_power_level")
@ -28,7 +28,7 @@ public class WoPowerLevel implements Serializable {
private Long id; private Long id;
@ApiModelProperty("功率等级名称，（现场人员手动录入）") @ApiModelProperty("功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@ApiModelProperty("pmpp_low,（现场人员手动录入）") @ApiModelProperty("pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;
@ -39,7 +39,7 @@ public class WoPowerLevel implements Serializable {
@ApiModelProperty("物料号,（现场人员手动录入）") @ApiModelProperty("物料号,（现场人员手动录入）")
private String sapMaterialNum; private String sapMaterialNum;
@ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
private Integer lineBody; private Integer lineBody;
@ApiModelProperty("lable_voc,（手动录入）") @ApiModelProperty("lable_voc,（手动录入）")

6
ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java
View File

@ -12,21 +12,21 @@ import java.util.Date;
* 功率等级 表 * 功率等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@Data @Data
public class WoPowerLevelExcel { public class WoPowerLevelExcel {
@Excel(name = "ID") @Excel(name = "ID")
private Long id; private Long id;
@Excel(name = "功率等级名称，（现场人员手动录入）") @Excel(name = "功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@Excel(name = "pmpp_low,（现场人员手动录入）") @Excel(name = "pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;
@Excel(name = "pmpp_high,（现场人员手动录入）") @Excel(name = "pmpp_high,（现场人员手动录入）")
private Float pmppHigh; private Float pmppHigh;
@Excel(name = "物料号,（现场人员手动录入）") @Excel(name = "物料号,（现场人员手动录入）")
private String sapMaterialNum; private String sapMaterialNum;
@Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）") @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
private Integer lineBody; private Integer lineBody;
@Excel(name = "lable_voc,（手动录入）") @Excel(name = "lable_voc,（手动录入）")
private BigDecimal lableVoc; private BigDecimal lableVoc;

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 功率等级 表 * 功率等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@Mapper @Mapper
public interface WoPowerLevelMapper extends BaseDao<WoPowerLevel> { public interface WoPowerLevelMapper extends BaseDao<WoPowerLevel> {

12
ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPowerLevelmysql.sql
View File

@ -1,7 +1,7 @@
-- 菜单初始SQL -- 菜单初始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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (1628374086450421766, 1628374086450421761, '导出', NULL, 'code:woPowerLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

2
ym-generator/src/main/java/com/cnbm/generator/code/service/WoPowerLevelServiceBiz.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WoPowerLevel;
* 功率等级 表 * 功率等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
public interface WoPowerLevelServiceBiz extends CrudService<WoPowerLevel, WoPowerLevelDTO> { public interface WoPowerLevelServiceBiz extends CrudService<WoPowerLevel, WoPowerLevelDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPowerLevelServiceBizImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 功率等级 表 * 功率等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-20 * @since 2023-02-22
*/ */
@Service @Service
public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapper, WoPowerLevel, WoPowerLevelDTO> implements WoPowerLevelServiceBiz { public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapper, WoPowerLevel, WoPowerLevelDTO> implements WoPowerLevelServiceBiz {

17
ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
View File

@ -1,6 +1,7 @@
package com.cnbm.packing.controller; package com.cnbm.packing.controller;
import com.cnbm.admin.annotation.LogOperation; import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.admin.utils.CodeGeneratorHelper;
import com.cnbm.common.constant.Constant; import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils; import com.cnbm.common.utils.ExcelUtils;
@ -68,7 +69,7 @@ public class PrintModelController {
@PostMapping @PostMapping
@ApiOperation("保存") @ApiOperation("保存")
@LogOperation("保存") // @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:printModel:save')") // @PreAuthorize("@ex.hasAuthority('packing:printModel:save')")
public Result<Long> save(@RequestBody PrintModelDTO dto){ public Result<Long> save(@RequestBody PrintModelDTO dto){
//效验数据 //效验数据
@ -116,16 +117,16 @@ public class PrintModelController {
} }
@PostMapping(value = "list") @PostMapping(value = "list")
@ApiOperation(value = "获取班组列表") @ApiOperation(value = "获取打印标签模板列表")
@LogOperation("获取班组列表") // @LogOperation("获取打印标签模板列表")
public List<PrintModelDTO> list() { return printModelService.list(); } public List<PrintModelDTO> list() { return printModelService.list(); }
@PostMapping(value = "get-packing") @PostMapping(value = "getCode")
@ApiOperation(value = "获取标签编码") @ApiOperation(value = "获取标签编码")
@LogOperation("获取标签编码") // @LogOperation("获取标签编码")
private Result<String> getCode() { public Result<String> getCode() {
String packing = printModelService.getCode(); String code = printModelService.getCode();
return new Result<String>().ok(packing); return new Result<String>().ok(code);
} }
} }

2
ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java
View File

@ -27,7 +27,7 @@ public class WoPowerLevelDTO implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）") @ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）") @ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;

2
ym-packing/src/main/java/com/cnbm/packing/entity/WoPowerLevel.java
View File

@ -28,7 +28,7 @@ public class WoPowerLevel implements Serializable {
private Long id; private Long id;
@ApiModelProperty("功率等级名称，（现场人员手动录入）") @ApiModelProperty("功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@ApiModelProperty("pmpp_low,（现场人员手动录入）") @ApiModelProperty("pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;

2
ym-packing/src/main/java/com/cnbm/packing/excel/WoPowerLevelExcel.java
View File

@ -19,7 +19,7 @@ public class WoPowerLevelExcel {
@Excel(name = "ID") @Excel(name = "ID")
private Long id; private Long id;
@Excel(name = "功率等级名称，（现场人员手动录入）") @Excel(name = "功率等级名称，（现场人员手动录入）")
private Integer powerClass; private String powerClass;
@Excel(name = "pmpp_low,（现场人员手动录入）") @Excel(name = "pmpp_low,（现场人员手动录入）")
private Float pmppLow; private Float pmppLow;
@Excel(name = "pmpp_high,（现场人员手动录入）") @Excel(name = "pmpp_high,（现场人员手动录入）")