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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-10-31 18:06:14 +08:00
parent 205d678a0e 928bb40dd5
commit 2c5ac2499b
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java
View File

@@ -172,7 +172,7 @@ public class PurchaseOrderRespVO {
@ExcelProperty("物料类型(字典:MTRL_TP)") @ExcelProperty("物料类型(字典:MTRL_TP)")
private String mtrlTp; private String mtrlTp;
@Schema(description = "订单分类", example = "2") @Schema(description = "订单分类(字典：SPLY_BSN_TP)", example = "2")
@ExcelProperty("订单分类") @ExcelProperty("订单分类")
private String splyBsnTp; private String splyBsnTp;

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java
View File

@@ -175,7 +175,7 @@ public class PurchaseOrderSaveReqVO {
@ExcelProperty("物料类别") @ExcelProperty("物料类别")
private String mtrlTp; private String mtrlTp;
@Schema(description = "订单分类", example = "2") @Schema(description = "订单分类(字典：SPLY_BSN_TP)", example = "2")
@ExcelProperty("订单分类") @ExcelProperty("订单分类")
private String splyBsnTp; private String splyBsnTp;
} }

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java
View File

@@ -252,7 +252,7 @@ public class PurchaseOrderDO extends BusinessBaseDO {
private String mtrlTp; private String mtrlTp;
/** /**
* 订单分类 * 订单分类(字典：SPLY_BSN_TP)
* *
*/ */
@TableField("SPLY_BSN_TP") @TableField("SPLY_BSN_TP")

1
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java
View File

@@ -61,7 +61,6 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
.eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR") .eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR")
.eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause()) .eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause())
.eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus()) .eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus())
.eqIfPresent(PurchaseOrderDO::getMtrlTp, reqVO.getMtrlTp())
.likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName()) .likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
.orderByDesc(PurchaseOrderDO::getId)); .orderByDesc(PurchaseOrderDO::getId));
} }