From 01d8334aaf05ff0ac0e4c0de3e43b4ee6d6fa73b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 09 八月 2024 10:39:52 +0800
Subject: [PATCH] 修改流程卡打印查询，补片流程卡同步流程卡的修改
---
north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
index d2b6019..3459587 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml
@@ -8,7 +8,7 @@
<result column="scheduling_quantity" property="schedulingQuantity"/>
<result column="order_number" property="orderNumber"/>
<result column="scheduling_id" property="schedulingId"/>
- <result column="order_id" property="orderGlassDetail.orderId"/>
+ <result column="order_id" property="order.orderId"/>
<result column="technology_number" property="technologyNumber"/>
<result column="pendingProductionQuantity" property="pendingProductionQuantity"/>
<result column="pendingProductionArea" property="pendingProductionArea"/>
@@ -80,8 +80,8 @@
and od.create_time between #{selectTime1} and #{selectTime2}
and position(#{processes} in ps.processes)
and position(#{orderIds} in ps.order_id)
- <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
- and ogd.order_id regexp #{productionScheduling.orderId}
+ <if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.order.orderId}
</if>
<if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
and o.customer_name regexp #{productionScheduling.order.customerName}
@@ -143,8 +143,8 @@
and position(#{orderIds} in ogd.order_id)
-- and position("鍒囧壊" in ps.processes)
- <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
- and ogd.order_id regexp #{productionScheduling.orderId}
+ <if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
+ and ogd.order_id regexp #{productionScheduling.order.orderId}
</if>
<if test="productionScheduling.order.customerName != null and productionScheduling.order.customerName != ''">
and o.customer_name regexp #{productionScheduling.order.customerName}
--
Gitblit v1.8.0