zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托加工和回收率管理优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-03 10:14:26 +08:00
parent 0033bdc4c5
commit daeeb83624
11 changed files with 116 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java
View File

@@ -44,5 +44,9 @@ public class MaterialDestroyPageReqVO extends PageParam {
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String receiveUnit;
@Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String sendUnit;
}

6
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java
View File

@@ -56,5 +56,11 @@ public class MaterialDestroyRespVO {
@Schema(description = "是否启用")
@ExcelProperty("是否启用")
private String isEnable;
@Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("收货单位")
private String receiveUnit;
@Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("发货单位")
private String sendUnit;
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java
View File

@@ -47,5 +47,9 @@ public class MaterialDestroySaveReqVO {
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String receiveUnit;
@Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
private String sendUnit;
}

10
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java
View File

@@ -109,4 +109,14 @@ public class MaterialDestroyDO extends BusinessBaseDO {
@TableField("IS_ENB")
private String isEnable;
/**
* 发货计量单位
*/
@TableField("SND_UNT")
private String sendUnit;
/**
* 收货计量单位
*/
@TableField("RCV_UNT")
private String receiveUnit;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java
View File

@@ -26,6 +26,8 @@ public interface MaterialDestroyMapper extends BaseMapperX<MaterialDestroyDO> {
.betweenIfPresent(MaterialDestroyDO::getCreateTime, reqVO.getCreateTime())
.likeIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber())
.likeIfPresent(MaterialDestroyDO::getSupplierName, reqVO.getSupplierName())
.likeIfPresent(MaterialDestroyDO::getSendUnit, reqVO.getSendUnit())
.likeIfPresent(MaterialDestroyDO::getReceiveUnit, reqVO.getReceiveUnit())
.eqIfPresent(MaterialDestroyDO::getIsEnable, reqVO.getIsEnable())
.orderByDesc(MaterialDestroyDO::getId));
}