From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 03 二月 2024 13:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 70 ++++++++++++++++-------------------
1 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 4bf7021..b873794 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -6,20 +6,17 @@
<resultMap id="flowCardMap" type="com.example.erp.entity.pp.FlowCard">
<result column="order_id" property="orderId"/>
- <result column="production_id" property="productionId"/>
- <result column="splitting_status" property="splittingStatus"/>
- <result column="create_time" property="createTime"/>
+ <result column="process_Id" property="processId"/>
+ <result column="binning_quantity" property="binningQuantity"/>
+ <result column="founder" property="founder"/>
<!--鎺ユ敹鍏朵粬澶栭敭瀹炰綋绫绘暟鎹�-->
<association property="order" javaType="com.example.erp.entity.sd.Order">
- <result column="batch" property="batch"/>
+ <result column="project" property="project"/>
</association>
<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
+ <result column="product_id" property="productId"/>
<result column="product_name" property="productName"/>
- <result column="compute_area" property="computeArea"/>
- <result column="quantity" property="quantity"/>
<result column="compute_gross_area" property="computeGrossArea"/>
- <result column="perimeter" property="perimeter"/>
- <result column="bend_radius" property="bendRadius"/>
<result column="processing_note" property="processingNote"/>
</association>
@@ -29,44 +26,41 @@
</resultMap>
<select id="selectFlowCard" resultMap="flowCardMap">
select
- a.order_id,
- a.production_id,
- c.batch,
- b.product_name,
- b.compute_area,
- b.quantity,
- b.compute_gross_area,
- b.perimeter,
- b.bend_radius,
- b.processing_note
- from order_glass_detail as a
- LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
- `order` as c on a.order_id=c.order_id
+ a.order_Id,
+ a.process_Id,
+ c.product_id,
+ c.product_name,
+ b.project,
+ a.binning_quantity,
+ c.compute_gross_area,
+ a.founder,
+ c.processing_note
+ from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
+ left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
<where>
- <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
- and a.order_id regexp #{orderGlassDetail.orderId}
+ <if test="flowCard.orderId != null and flowCard.orderId != ''">
+ and a.order_id regexp #{flowCard.orderId}
</if>
- <if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
- and a.production_id regexp #{orderGlassDetail.productionId}
+ <if test="flowCard.productionId != null and flowCard.productionId != ''">
+ and a.process_Id regexp #{flowCard.productionId}
</if>
- <if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
- and c.batch regexp #{orderGlassDetail.order.batch}
+ <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
+ and c.product_id regexp #{flowCard.orderDetail.productId}
</if>
- <if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
- and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
+ <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
+ and c.product_name regexp #{flowCard.orderDetail.productName}
</if>
- <if test="orderGlassDetail.splittingStatus=0 " >
- and a.splitting_status regexp #{state}
+
+ <if test="flowCard.order.project != null and flowCard.order.project!= ''">
+ and b.project regexp #{flowCard.order.project}
</if>
- <if test="orderGlassDetail.splittingStatus=1">
- and a.splitting_status regexp #{state}
- </if>
- <if test="orderGlassDetail.createTime != ''">
- and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+
+ <if test="flowCard.createTime != ''">
+ and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
</if>
</where>
- group by a.production_id,a.order_number
- order by a.id desc
+ group by a.process_Id
+
;
--
Gitblit v1.8.0