From 96a4cf9292b01c819f5a424a0730cd76222950d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Mon, 19 Aug 2024 09:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B3=A8=E5=A1=91=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs     |  8 +++++---
 .../Controllers/TJZhuSuPlanController.cs          | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs
index 6521c31..4100c83 100644
--- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJZhuSuPlanBLL.cs
@@ -707,6 +707,10 @@ namespace QMAPP.FJC.BLL.TianJin
                         model.PLAN_STATE = "3";
                     TJZhuSuPlanDAL cmdDAL = new TJZhuSuPlanDAL();
 
+                    model.PLAN_DATE = ma.PLAN_DATE;
+                    model.PLAN_NO = ma.PLAN_NO;
+                    model.PLAN_SEQ = ma.PLAN_NO.Substring(10, 3);
+
                     if (ExistsOrderPlan(model) > 0)
                     {
                         result.IsSuccess = false;
@@ -714,9 +718,7 @@ namespace QMAPP.FJC.BLL.TianJin
                         return result;
                     }
 
-                    model.PLAN_DATE = ma.PLAN_DATE;
-                    model.PLAN_NO = ma.PLAN_NO;
-                    model.PLAN_SEQ = ma.PLAN_NO.Substring(10, 4);
+                   
 
                     List.Add(model);
                     result.Result.insertNum += 1;
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJZhuSuPlanController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJZhuSuPlanController.cs
index 7e9d84d..65b8ee2 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/TJZhuSuPlanController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJZhuSuPlanController.cs
@@ -287,6 +287,11 @@ namespace QMAPP.FJC.Web.Controllers
             string orderby = Request.Form["ORDER_TYPE"];
             ServiceAgent wcfAgent = this.GetServiceAgent();
 
+            using (System.IO.StreamWriter file = new System.IO.StreamWriter(@"D:\ceshi\WriteLines.txt", true))
+            {
+                file.WriteLine("1111");
+            }
+
             Materiel materialmodel = new Materiel();
             ProduceShift produceshiftmodel = new ProduceShift();
             MachineInfo machine = new MachineInfo();
@@ -294,9 +299,19 @@ namespace QMAPP.FJC.Web.Controllers
             QMAPP.MD.Entity.WorkCell workcell = new QMAPP.MD.Entity.WorkCell();
             workcell.WORKCELL_CODE = orderby;
 
+            using (System.IO.StreamWriter file = new System.IO.StreamWriter(@"D:\ceshi\WriteLines.txt", true))
+            {
+                file.WriteLine("22222");
+            }
+
             try
             {
                 dt = this.GetTableByExcel("TJZhuSuPlanImp", fileName, dt);
+
+                using (System.IO.StreamWriter file = new System.IO.StreamWriter(@"D:\ceshi\WriteLines.txt", true))
+                {
+                    file.WriteLine("3333");
+                }
                 //格式转换
                 list = QMFrameWork.Common.Util.BindHelper.ConvertToList<TJZhuSuPlan>(dt).ToList();
                 serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("TJZhuSuPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);