From 1bd7f11eda6c31b45b9e5f4604238774850e94eb Mon Sep 17 00:00:00 2001
From: "dequan.zhang" <13820060@qq.com>
Date: Wed, 26 Apr 2023 13:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=BD=E6=AA=90=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs
index b001f37..74a10a5 100644
--- a/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs
@@ -321,7 +321,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan
                 }
                 if (workcellcode == "BRIM_WELDING_BC316")
                 {
-                    sql.AppendFormat(" ORDER BY	W.[PLAN_DATE]) A  ");
+                    sql.AppendFormat(" ORDER BY	W.ORDER_TYPE, W.[PLAN_DATE]) A  ");
                     sql.AppendFormat(" ORDER BY A.[UPDATEDATE],A.[PRI],A.[PLAN_DATE],A.PLAN_SEQ,A.[SEQ],A.[MATERIAL_CODE] ");
                 }
                 else
@@ -842,7 +842,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan
      
                 if (workcellcode == "BRIM_WELDING_BC316")
                 {
-                    sql.AppendFormat(" ORDER BY	W.[PLAN_DATE]) A  ");
+                    sql.AppendFormat(" ORDER BY	W.ORDER_TYPE, W.[PLAN_DATE]) A  ");
                     sql.AppendFormat(" ORDER BY A.[UPDATEDATE],A.[PRI],A.[PLAN_DATE],A.PLAN_SEQ,A.[SEQ],A.[MATERIAL_CODE] ");
                 }
                 else