From 662df700659a2c52f891de5cdd298864f6bd686b Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Fri, 31 Oct 2025 16:33:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/purchaseorder/PurchaseOrderMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java index 5aa8ac5..08363db 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -61,7 +61,6 @@ public interface PurchaseOrderMapper extends BaseMapperX { .eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR") .eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause()) .eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus()) - .eqIfPresent(PurchaseOrderDO::getMtrlTp, reqVO.getMtrlTp()) .likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName()) .orderByDesc(PurchaseOrderDO::getId)); } From 928bb40dd57ad3b4862ff111aeb34d8f5d9520f0 Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Fri, 31 Oct 2025 17:04:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java | 2 +- .../admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java | 2 +- .../dal/dataobject/purchaseorder/PurchaseOrderDO.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java index 17079d6..e929725 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java @@ -172,7 +172,7 @@ public class PurchaseOrderRespVO { @ExcelProperty("物料类型(字典:MTRL_TP)") private String mtrlTp; - @Schema(description = "订单分类", example = "2") + @Schema(description = "订单分类(字典：SPLY_BSN_TP)", example = "2") @ExcelProperty("订单分类") private String splyBsnTp; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java index eb7438e..7b1d2c6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java @@ -175,7 +175,7 @@ public class PurchaseOrderSaveReqVO { @ExcelProperty("物料类别") private String mtrlTp; - @Schema(description = "订单分类", example = "2") + @Schema(description = "订单分类(字典：SPLY_BSN_TP)", example = "2") @ExcelProperty("订单分类") private String splyBsnTp; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java index 4ce3794..9d3b4f1 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java @@ -252,7 +252,7 @@ public class PurchaseOrderDO extends BusinessBaseDO { private String mtrlTp; /** - * 订单分类 + * 订单分类(字典：SPLY_BSN_TP) * */ @TableField("SPLY_BSN_TP")