From bc3f075d422e27dedb8c1a2bd4a2d374540e492a Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 17 May 2024 11:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java index a5fcbfb..9598573 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java @@ -35,7 +35,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao { public ListPager querySapProductPlanPager(SapProductPlan sapProductPlan, Pager pager) { //查询数据 StringBuffer dataHql = new StringBuffer("select sap.plnum,sap.plmat,ifnull(sap.gsmng,0) as sumQty," + - "ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," + + "ifnull(mes.reported_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," + "sap.plwrk,sap.create_date_time,sap.create_user,sap.modify_date_time,sap.modify_user"); StringBuilder hql = new StringBuilder(); hql.append(" from sap_product_plan sap left join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " + @@ -44,7 +44,7 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao { //拼接查询条件 packWhere(sapProductPlan, hql); StringBuffer unionDataHql = new StringBuffer("select sap.plnum,mes.part_no,ifnull(mes.qty,0) as sumQty," + - "ifnull(mes.complete_qty,0) as completeQty,part.unit,sap.psttr,sap.pedtr,sap.l_str," + + "ifnull(mes.reported_qty,0) as completeQty,part.unit,sap.psttr,sap.pedtr,sap.l_str," + "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user"); StringBuilder unionHql = new StringBuilder(); unionHql.append(" from sap_product_plan sap right join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +