From b529d99aed6a1e1dc4223057813d221d988987bd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 14 十一月 2023 14:35:53 +0800
Subject: [PATCH] Changes12
---
mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml | 140 +++++++++++++++++++++++++++++++++-------------
1 files changed, 100 insertions(+), 40 deletions(-)
diff --git a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
index 184e593..b9ac663 100644
--- a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
+++ b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml
@@ -242,52 +242,112 @@
pco.centralized_mining_property
</sql>
+ <resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2">
+ <id property="id" column="id"/>
+ <result property="contractNo" column="contract_no"/>
+ <result property="entityName" column="entity_name"/>
+ <result property="createUser" column="create_user"/>
+ <result property="createTime" column="create_time"/>
+ <result property="placeOrderDate" column="place_order_date"/>
+ <result property="customerName" column="customer_name"/>
+ <result property="coState" column="co_state"/>
+ <result property="isAudit" column="is_audit"/>
+ <result property="sourceId" column="source_id"/>
+ <result property="productType" column="product_type"/>
+ <result property="partNo" column="part_no"/>
+ <result property="productName" column="product_name"/>
+ <result property="customerPartSpec" column="customer_part_spec"/>
+ <result property="otcUnit" column="otc_unit"/>
+ <result property="buyQtyDue" column="buy_qty_due"/>
+ <result property="docNumber" column="number"/>
+ <result property="technologyDocumentId" column="technology_document_id"/>
+ <result property="returnStatus" column="return_status"/>
+ <result property="originalContractStatus" column="original_contract_status"/>
+ <result property="salesMan" column="sales_man"/>
+ <result property="deliveryDate" column="delivery_date"/>
+ <result property="manufactureAttr" column="manufacture_attr"/>
+ <result property="remark" column="remark"/>
+ </resultMap>
+
<!-- 闇�瑕佸鐞� -->
- <select id="getCustomerOrderPage" resultMap="dtoResultMap">
+ <select id="getCustomerOrderPage" resultMap="resultMap">
SELECT
- *
+ pco.id ,
+ contract_no ,
+ pc.entity_name ,
+ pc.create_user ,
+ pc.create_time ,
+ place_order_date ,
+ pc.customer_name ,
+ co_state ,
+ is_audit ,
+ source_id ,
+ product_type ,
+ pco.part_no ,
+ product_name ,
+ customer_part_spec ,
+ otc_unit ,
+ buy_qty_due ,
+ technology_document_id,
+ td.number ,
+ return_status ,
+ original_contract_status ,
+ sales_man ,
+ delivery_date,
+ manufacture_attr,
+ pco.remark
FROM
- (SELECT
- <include refid="customerOrder_property"/>,
- (SELECT COALESCE(SUM(pmps.qty_required),0)
- FROM plan_master_production_schedule pmps
- LEFT JOIN plan_join_model_customer pjmc on pjmc.model_id=pmps."id" AND pjmc.model = 'plan_master_production_schedule'
- WHERE pjmc.customer_order_id=pco."id")
- require_number,
- (SELECT COALESCE(SUM(wjso.reserved_quantity),0)
- FROM warehouse_join_stock_order wjso
- WHERE wjso.customer_order_id = pco."id" AND wjso.type ='瀹㈡埛璁㈠崟棰勭暀' AND status ='02confirmed' )
- reserved_quantity_realtime,
- bp."id" part_id,
- bp.part_name,
- bp.unit,
- pc.entity_name,
- pc.verify_date,
- pc.customer_contract_no,
- pc.comment,
- pc.return_status,
- pc.place_order_date,
- pc.factory_place_order_date,
- pc.original_contract_status,
- pc.end_time,
- cop.value outerColor,
- td.name doc_name,
- td.number doc_number,
- td.insulation_color,
- td.sheath_color
- FROM
- plan_customer_order pco
- LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id
- LEFT JOIN basic_part bp ON bp.part_no = pco.part_no
- LEFT JOIN technology_document td ON td.id = pco.technology_document_id
- LEFT JOIN plan_customer_order_param cop ON cop.order_id = pco.ID
- AND field = 'OuterColor'
- ) tempA
- <where>
+ plan_customer_order pco
+ LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id
+ LEFT JOIN technology_document td ON td.id = pco.technology_document_id
+ where 1=1
<if test="ew.emptyOfWhere == false">
and ${ew.SqlSegment}
</if>
- </where>
+<!-- SELECT-->
+<!-- *-->
+<!-- FROM-->
+<!-- (SELECT-->
+<!-- <include refid="customerOrder_property"/>,-->
+<!-- (SELECT COALESCE(SUM(pmps.qty_required),0)-->
+<!-- FROM plan_master_production_schedule pmps-->
+<!-- LEFT JOIN plan_join_model_customer pjmc on pjmc.model_id=pmps."id" AND pjmc.model = 'plan_master_production_schedule'-->
+<!-- WHERE pjmc.customer_order_id=pco."id")-->
+<!-- require_number,-->
+<!-- (SELECT COALESCE(SUM(wjso.reserved_quantity),0)-->
+<!-- FROM warehouse_join_stock_order wjso-->
+<!-- WHERE wjso.customer_order_id = pco."id" AND wjso.type ='瀹㈡埛璁㈠崟棰勭暀' AND status ='02confirmed' )-->
+<!-- reserved_quantity_realtime,-->
+<!-- bp."id" part_id,-->
+<!-- bp.part_name,-->
+<!-- bp.unit,-->
+<!-- pc.entity_name,-->
+<!-- pc.verify_date,-->
+<!-- pc.customer_contract_no,-->
+<!-- pc.comment,-->
+<!-- pc.return_status,-->
+<!-- pc.place_order_date,-->
+<!-- pc.factory_place_order_date,-->
+<!-- pc.original_contract_status,-->
+<!-- pc.end_time,-->
+<!-- cop.value outerColor,-->
+<!-- td.name doc_name,-->
+<!-- td.number doc_number,-->
+<!-- td.insulation_color,-->
+<!-- td.sheath_color-->
+<!-- FROM-->
+<!-- plan_customer_order pco-->
+<!-- LEFT JOIN plan_customer pc ON pc."id" = pco.customer_id-->
+<!-- LEFT JOIN basic_part bp ON bp.part_no = pco.part_no-->
+<!-- LEFT JOIN technology_document td ON td.id = pco.technology_document_id-->
+<!-- LEFT JOIN plan_customer_order_param cop ON cop.order_id = pco.ID-->
+<!-- AND field = 'OuterColor'-->
+<!-- ) tempA-->
+<!-- <where>-->
+<!-- <if test="ew.emptyOfWhere == false">-->
+<!-- and ${ew.SqlSegment}-->
+<!-- </if>-->
+<!-- </where>-->
</select>
<select id="getCustomerOrderById" resultType="com.alibaba.fastjson.JSONObject">
--
Gitblit v1.9.3