From 6bec9f10fecd2e5966aa152fc9bb8bcabb96cbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Fri, 31 Oct 2025 11:27:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/salesorder/vo/SalesOrderRespVO.java  | 8 +++++++-
 .../service/purchaseorder/PurchaseOrderServiceImpl.java   | 2 +-
 .../service/salesorder/SalesOrderServiceImpl.java         | 2 +-
 3 files changed, 9 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/salesorder/vo/SalesOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java
index ee87f60..0ea0bc9 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java
@@ -2,6 +2,7 @@ package com.zt.plat.module.contractorder.controller.admin.salesorder.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PrchOrdDtlRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -213,6 +214,11 @@ public class SalesOrderRespVO {
     @Schema(description = "产品组编码")
     @ExcelProperty("产品组编码")
     private String pdtGrpCdg;
-
+    @Schema(description = "付款方名称")
+    @ExcelProperty("付款方名称")
+    private String payerName;
+    @Schema(description = "付款方编码")
+    @ExcelProperty("付款方编码")
+    private String payerNum;
 
 }
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
index 9caae58..2ba7012 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
@@ -94,7 +94,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     public PurchaseOrderRespVO createPurchaseOrder(PurchaseOrderSaveReqVO createReqVO) {
         // 插入
         PurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, PurchaseOrderDO.class);
-        if (Objects.equals(createReqVO.getIsPush(), 0)) {
+        if (Objects.equals(createReqVO.getIsPush(), 1)) {
             purchaseOrder.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态
         } else {
             purchaseOrder.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
index 616ea10..bb736c5 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
@@ -94,7 +94,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class);
         //订单号
         //生成订单号
-        if (Objects.equals(createReqVO.getIsPush(), 0)) {
+        if (Objects.equals(createReqVO.getIsPush(), 1)) {
             createReqVO.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态
         } else {
             createReqVO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());