From 2fb28b36f15de26249ae34160e1accf118c011c7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:47:17 +0800
Subject: [PATCH] Changes16

---
 mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
index d5b1e91..9d6f977 100644
--- a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
+++ b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
@@ -244,7 +244,7 @@
 
 	<resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2">
 		<id property="id" column="id"/>
-		<result property="customerOrderNo" column="customer_order_no"/>
+		<result property="contractNo" column="contract_no"/>
 		<result property="entityName" column="entity_name"/>
 		<result property="createUser" column="create_user"/>
 		<result property="createTime" column="create_time"/>
@@ -267,13 +267,14 @@
 		<result property="deliveryDate" column="delivery_date"/>
 		<result property="manufactureAttr" column="manufacture_attr"/>
 		<result property="remark" column="remark"/>
+		<result property="wantedDeliveryDate" column="wanted_delivery_date"/>
 	</resultMap>
 
     <!-- 闇�瑕佸鐞� -->
 	<select id="getCustomerOrderPage" resultMap="resultMap">
 		select * from (SELECT
 		pco.id ,
-		customer_order_no ,
+		contract_no ,
 		pc.entity_name ,
 		pc.create_user ,
 		pc.create_time ,
@@ -295,7 +296,8 @@
 		sales_man ,
 		delivery_date,
 		manufacture_attr,
-		pco.remark
+		pco.remark,
+		wanted_delivery_date
 		FROM
 		plan_customer_order pco
 		LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id

--
Gitblit v1.9.3