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

Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4

Browse Source 
# Conflicts:
#	ym-packing/pom.xml
This commit is contained in:
caixiang
2023-02-22 20:49:04 +08:00
parent 4d1a58b8c7 7a6fffbf21
commit 1ebe39b60a
69 changed files with 3383 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ym-packing/pom.xml
View File

@@ -23,11 +23,6 @@
<artifactId>ym-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.cnbm</groupId>-->
<!-- <artifactId>ym-core</artifactId>-->
<!-- <version>1.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.cnbm</groupId>
<artifactId>ym-s7</artifactId>
@@ -48,5 +43,6 @@
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
>>>>>>>>> Temporary merge branch 2
</dependencies>
</project>

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

@@ -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<Long> save(@RequestBody PrintModelDTO dto){
//效验数据
@@ -116,16 +117,16 @@ public class PrintModelController {
}
@PostMapping(value = "list")
@ApiOperation(value = "获取班组列表")
@LogOperation("获取班组列表")
@ApiOperation(value = "获取打印标签模板列表")
// @LogOperation("获取打印标签模板列表")
public List<PrintModelDTO> list() { return printModelService.list(); }
@PostMapping(value = "get-packing")
@PostMapping(value = "getCode")
@ApiOperation(value = "获取标签编码")
@LogOperation("获取标签编码")
private Result<String> getCode() {
String packing = printModelService.getCode();
return new Result<String>().ok(packing);
// @LogOperation("获取标签编码")
public Result<String> getCode() {
String code = printModelService.getCode();
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;
@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
private Integer powerClass;
private String powerClass;
@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
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;
@ApiModelProperty("功率等级名称，（现场人员手动录入）")
private Integer powerClass;
private String powerClass;
@ApiModelProperty("pmpp_low,（现场人员手动录入）")
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")
private Long id;
@Excel(name = "功率等级名称，（现场人员手动录入）")
private Integer powerClass;
private String powerClass;
@Excel(name = "pmpp_low,（现场人员手动录入）")
private Float pmppLow;
@Excel(name = "pmpp_high,（现场人员手动录入）")