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

打印模板isEnable

Browse Source
This commit is contained in:
闫阳
2023-03-08 11:30:02 +08:00
parent 1684075a9c
commit 5f5a60eb29
15 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class PrintModelController {
@ApiImplicitParam(name = "name", value = "标签名称", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = "type", value = "类型，0：模组标签，1：等级标签", paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "lineBody", value = "线体，1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "enabled", value = "启用状态:0 、停用，1、启用", paramType = "query", dataTypeClass = Integer.class)
@ApiImplicitParam(name = "isEnable", value = "启用状态:0 、停用，1、启用", paramType = "query", dataTypeClass = Integer.class)
})
@PreAuthorize("@ex.hasAuthority('packing:printModel:page')")
public Result<PageData<PrintModelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){

3
ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java
View File

@@ -77,4 +77,7 @@ public class PrintModelDTO implements Serializable {
@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
private Integer lineBody;
@ApiModelProperty(value = "是否启用，0 停用；1 启用")
private Integer isEnable;
}

5
ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java
View File

@@ -78,6 +78,9 @@ public class PrintModel implements Serializable {
@ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
private Integer lineBody;
@ApiModelProperty("是否启用，0 停用；1 启用")
private Integer isEnable;
public static final String ID = "ID";
@@ -115,4 +118,6 @@ public class PrintModel implements Serializable {
public static final String LINE_BODY = "line_body";
public static final String IS_ENABLE = "is_enable";
}

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

@@ -52,5 +52,7 @@ public class PrintModelExcel {
private String content;
@Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
private Integer lineBody;
@Excel(name = "是否启用，0 停用；1 启用")
private Integer isEnable;
}

6
ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
View File

@@ -47,9 +47,9 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
Integer lineBody = Integer.parseInt(params.get("lineBody").toString());
wrapper.eq(ObjectUtils.isNotNull(lineBody), PrintModel.LINE_BODY, lineBody);
}
if(params.get("enabled")!=null) {
Integer enabled = Integer.parseInt(params.get("enabled").toString());
wrapper.eq(ObjectUtils.isNotNull(enabled), PrintModel.ENABLED, enabled);
if(params.get("isEnable")!=null) {
Integer isEnable = Integer.parseInt(params.get("isEnable").toString());
wrapper.eq(ObjectUtils.isNotNull(isEnable), PrintModel.IS_ENABLE, isEnable);
}
return wrapper;