From b8c6b748ba863197459226471b40dd6f9fa5f031 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <songnan.zhang@ccwin-in.com>
Date: Wed, 9 Feb 2022 13:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A9=E6=B4=A5=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/QMAPP.Web/Views/Home/Login.aspx           |   2 +-
 APP/QMAPP.Web/Web.config                      |   9 +-
 .../TianJin/TJDoorPlankPlanBLL.cs             | 225 ++++------
 APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs  |   2 +-
 APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs  |  23 --
 .../App_Data/Excel/TJDoorPlankPlanImp.xlsx    | Bin 0 -> 9343 bytes
 .../App_Data/Excel/TJDoorPlankPlanImp.xml     |  39 ++
 .../Controllers/TJDoorPlankPlanController.cs  |  10 +-
 .../Models/TianJin/TJDoorPlankPlanModel.cs    |   3 +-
 APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj      |   6 +
 .../5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx | Bin 0 -> 9422 bytes
 .../af9d4740-7223-4f5c-ad0c-8ffb489a1603.xlsx | Bin 0 -> 9440 bytes
 .../f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx | Bin 0 -> 9376 bytes
 .../TJDoorPlankPlan/DoorPlankPlanList.aspx    |   6 +-
 APPQ5/QMAPP.FJC.Web/Web.config                |   5 +-
 APPQ5/QMAPP.WinForm/App.config                |   8 +-
 .../Forms/TianJin/RerportModel.ttx            |   1 +
 .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 387 +++++++-----------
 .../Forms/TianJin/TJPastCard.rpt              | Bin 753664 -> 753664 bytes
 AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs |   5 +
 .../WCF/QMFrameWork.WebServiceHost/Web.config |   5 +-
 21 files changed, 300 insertions(+), 436 deletions(-)
 create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xlsx
 create mode 100644 APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xml
 create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx
 create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/af9d4740-7223-4f5c-ad0c-8ffb489a1603.xlsx
 create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx

diff --git a/APP/QMAPP.Web/Views/Home/Login.aspx b/APP/QMAPP.Web/Views/Home/Login.aspx
index 4276fcb..8ee0548 100644
--- a/APP/QMAPP.Web/Views/Home/Login.aspx
+++ b/APP/QMAPP.Web/Views/Home/Login.aspx
@@ -159,7 +159,7 @@
         <h1>
             富维安道拓数字化工厂</h1>
         <h2>
-            Adient CHENGDU Digital factory</h2>
+            Adient Digital factory</h2>
         <div id="printDiv" style="display: none;">
             <span style="font-weight: bold; font-size: 20px; font-family: 宋体; color: #FF0000;">您未安装客户端打印控件，请进行<a
                 id="A1" href="../../Scripts/Lodop/install_lodop32.exe"><span style="color: #FF0000;
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 8f958f7..d47ae3c 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -45,9 +45,12 @@
 
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
-    
-	</connectionStrings>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
+
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+
+
+  </connectionStrings>
   <!--日志组件配置开始-->
   <log4net>    
     <logger name="loginfo">
diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
index 4760d1d..7aa4e0d 100644
--- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
@@ -540,7 +540,7 @@ namespace QMAPP.FJC.BLL.TianJin
         }
         #endregion
 
-        #region 导入数据
+        #region 导入数据 --Web-导入计划
         /// <summary>
         /// 导入Excel表数据
         /// </summary>
@@ -549,156 +549,79 @@ namespace QMAPP.FJC.BLL.TianJin
         /// <param name="plantmodel">工厂信息</param>
         /// <param name="productbasicmodel">零件类别信息</param>
         /// <returns>结果</returns>
-        //public DataResult<ImportMessage> GetImportData(List<TJOrderPlan> list, Material materialmodel, QMAPP.FJC.Entity.Basic.MachineInfo machine, FJC.Entity.Basic.ProduceShift produceshiftmodel, QMAPP.MD.Entity.WorkCell workcellmodel)
-        //{
-        //    DataResult<ImportMessage> result = new DataResult<ImportMessage>();
-        //    TJDoorPlankPlanDAL cmDal = new TJDoorPlankPlanDAL();
-        //    List<TJOrderPlan> List = new List<TJOrderPlan>();
-        //    int index = 0;
-        //    int num = 0;
-        //    try
-        //    {
-        //        result.Result = new ImportMessage();
-        //        result.Result.Errors = new List<RowError>();
-        //        List<Material> materialinfo = null;
-        //        List<FJC.Entity.Basic.ProduceShift> produceshiftinfo = null;
-        //        List<QMAPP.FJC.Entity.Basic.MachineInfo> machineList = null;
-        //        using (IDataSession session = AppDataFactory.CreateMainSession())
-        //        {
-        //            ///获取物料信息
-        //            materialinfo = new QMAPP.MD.BLL.MaterialBLL().GetNewMaterialList(materialmodel,workcellmodel);
-        //            //获取班次信息
-        //            produceshiftinfo = new QMAPP.FJC.BLL.Basic.ProduceShiftBLL().GetWorkcenterShifts(workcellmodel.WORKCENTER_CODE);
-        //            //获取设备信息
-        //            machineList = new QMAPP.FJC.BLL.Basic.MachineInfoBLL().GetMachineForOrderList(machine, workcellmodel);
-        //            //状态判断
-        //            foreach (TJOrderPlan ma in list)
-        //            {
-        //                index++;
-        //                num++;
-        //                //物料
-        //                Material areaMes = materialinfo.Find(a => a.MATERIAL_CODE == ma.MATERIAL_CODE);
-        //                if (areaMes != null)
-        //                {
-        //                    ma.MATERIAL_CODE = areaMes.MATERIAL_CODE;
-        //                }
-        //                else
-        //                {
-        //                    ma.MATERIAL_CODE = null;
-        //                    result.Result.Errors.Add(new RowError(index, "物料信息不存在"));
-        //                    result.Result.failureNum += 1;
-        //                    continue;
-        //                }
-        //                //班次
-        //                FJC.Entity.Basic.ProduceShift plantMes = produceshiftinfo.Find(p => p.PRODUCESHIFTTCODE == ma.SHIFT_CODE);
-        //                if (plantMes != null)
-        //                {
-        //                    ma.SHIFT_CODE = plantMes.PRODUCESHIFTTCODE;
-        //                }
-        //                else
-        //                {
-        //                    ma.SHIFT_CODE = null;
-        //                    result.Result.Errors.Add(new RowError(index, "班次信息不存在"));
-        //                    result.Result.failureNum += 1;
-        //                    continue;
-        //                }
-        //                //转变生产要求PRODUCEREQUIRE
-        //                if (ma.PRODUCEREQUIRE != null)
-        //                {
-        //                    if (ma.PRODUCEREQUIRE.Equals("以数量为准"))
-        //                    {
-        //                        ma.PRODUCEREQUIRE = "0";
-        //                    }
-        //                    else if (ma.PRODUCEREQUIRE.Equals("以时间为准"))
-        //                    {
-        //                        ma.PRODUCEREQUIRE = "1";
-        //                    }
-        //                    else
-        //                    {
-        //                        ma.PRODUCEREQUIRE = null;
-        //                        result.Result.Errors.Add(new RowError(index, "生产要求信息错误"));
-        //                        result.Result.failureNum += 1;
-        //                        continue;
-        //                    }
-        //                }
-        //                if (string.IsNullOrEmpty(ma.InfoError) == false)
-        //                {
-        //                    ma.PID = null;
-        //                    result.Result.failureNum += 1;
-        //                    continue;
-        //                }
-        //                //修改改时根据主键等信息获取详细内容信息
-        //                TJOrderPlan oldInfo = cmDal.Get(ma);
-        //                if (oldInfo != null)
-        //                {
-        //                    //更新
-        //                    ma.PID = oldInfo.PID;
-        //                    ma.PLAN_SEQ = oldInfo.PLAN_SEQ;
-        //                    ma.FACTORY_CODE = oldInfo.FACTORY_CODE;
-        //                    ma.WORKCENTER_CODE = oldInfo.WORKCENTER_CODE;
-        //                    ma.PBOM_CODE = oldInfo.PBOM_CODE;
-        //                    ma.ROUTE_CODE = oldInfo.ROUTE_CODE;
-        //                    ma.PLAN_STATE = oldInfo.PLAN_STATE;
-        //                    ma.PLANSOURCE = oldInfo.PLANSOURCE;
-        //                    ma.CREATEUSER = oldInfo.CREATEUSER;
-        //                    ma.CREATEDATE = oldInfo.CREATEDATE;
-        //                    ma.UPDATEUSER = this.LoginUser.UserID;
-        //                    ma.UPDATEDATE = oldInfo.UPDATEDATE;
-        //                    ma.IsNewInfo = false;
-        //                    result.Result.updateNum += 1;
-        //                }
-        //                else
-        //                {
-        //                    //新增
-        //                    oldInfo = new TJOrderPlan();
-        //                    ma.PID = Guid.NewGuid().ToString();
-        //                    ma.PLAN_NO = ma.PLAN_NO;
-        //                    //int no = new TJDoorPlankPlanDAL().GetNum(ma) + (num - 1);
-        //                    //ma.PLAN_SEQ = ma.PLAN_DATE.ToString("yyyyMMdd") + no;
-        //                    ma.PLAN_STATE = EnumGeter.PLANSTATE.INIT.GetHashCode().ToString();
-        //                    ma.MATERIAL_CODE = ma.MATERIAL_CODE;
-        //                    ma.MACHINECODDE = ma.MACHINECODDE;
-        //                    ma.QTY = ma.QTY;
-        //                    //Pbom
-        //                    Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = ma.MATERIAL_CODE });
-        //                    ma.PBOM_CODE = pbomcode.PBOM_CODE;
-        //                    //工艺路线
-        //                    QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(ma.MATERIAL_CODE);
-        //                    ma.ROUTE_CODE = routecode.ROUTE_CODE;
-        //                    ma.PLAN_DATE = ma.PLAN_DATE;
-        //                    ma.SHIFT_CODE = ma.SHIFT_CODE;
-        //                    ma.PLANSOURCE = "1";
-        //                    ma.PRODUCEREQUIRE = ma.PRODUCEREQUIRE;
-        //                    ma.CREATEUSER = this.LoginUser.UserID;
-        //                    ma.CREATEDATE = DateTime.Now;
-        //                    ma.UPDATEUSER = ma.CREATEUSER;
-        //                    ma.UPDATEDATE = ma.CREATEDATE;
-        //                    //工作中心
-        //                    string workcentercode = new WorkCellDAL().GetWorkcenter(workcellmodel.WORKCELL_CODE);
-        //                    ma.WORKCENTER_CODE = workcentercode;
-        //                    //工厂
-        //                    string factory = new QMAPP.MD.DAL.FactoryDAL().GetFactoryWithWorkcenter(workcentercode);
-        //                    ma.FACTORY_CODE = factory;
-        //                    ma.IsNewInfo = true;
-        //                    result.Result.insertNum += 1;
-        //                }
-        //                List.Add(ma);
-        //            }
-        //        }
-        //        //导入
-        //        cmDal.GetImportData(List);
-        //        result.Msg = "导入成功";
-        //        result.IsSuccess = true;
-        //        return result;
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        result.IsSuccess = false;
-        //        result.Ex = ex;
-        //        return result;
-        //    }
-        //}
-        
+        public DataResult<ImportMessage> GetImportData(List<TJOrderPlan> list, Material materialmodel, QMAPP.FJC.Entity.Basic.MachineInfo machine, FJC.Entity.Basic.ProduceShift produceshiftmodel, QMAPP.MD.Entity.WorkCell workcellmodel)
+        {
+            DataResult<ImportMessage> result = new DataResult<ImportMessage>();
+            TJDoorPlankPlanDAL cmDal = new TJDoorPlankPlanDAL();
+            List<TJOrderPlan> List = new List<TJOrderPlan>();
+            int index = 0;
+            int num = 0;
+            try
+            {
+                result.Result = new ImportMessage();
+                result.Result.Errors = new List<RowError>();
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取流水号   导入数据的顺序号 导入文件自己定义
+                    //var SEQSTR = this.GetOrderPlanSeq(model);
+
+                    foreach (TJOrderPlan ma in list)
+                    {
+                        index++;
+                        num++;
+
+                        //计划单号
+                        ma.PLAN_NO = "DP" + ma.PLAN_DATE.ToString("yyyyMMdd") + ma.PLAN_SEQ.PadLeft(3,'0');
+
+                        TJDoorPlankPlanDAL cmdDAL = new TJDoorPlankPlanDAL();
+                        ma.MATERIAL_NAME = cmdDAL.GetMATERIALNAME(ma.MATERIAL_CODE);
+
+                        //修改改时根据主键等信息获取详细内容信息
+                        TJOrderPlan oldInfo = cmDal.Get(ma);
+                        if (oldInfo != null)
+                        {
+                            //更新
+                            ma.PID = oldInfo.PID;
+                            ma.PLAN_SEQ = oldInfo.PLAN_SEQ;
+                            ma.MATERIAL_CODE = oldInfo.MATERIAL_CODE;
+                            ma.MATERIAL_NAME = oldInfo.MATERIAL_NAME;
+                            ma.PLAN_STATE = oldInfo.PLAN_STATE;
+                            ma.LINENO = oldInfo.LINENO;
+                            ma.CREATEUSER = oldInfo.CREATEUSER;
+                            ma.CREATEDATE = oldInfo.CREATEDATE;
+                            ma.UPDATEUSER = this.LoginUser.UserID;
+                            ma.UPDATEDATE = oldInfo.UPDATEDATE;
+                            ma.IsNewInfo = false;
+                            result.Result.updateNum += 1;
+                        }
+                        else
+                        {
+                            //新增
+                            oldInfo = new TJOrderPlan();
+                            ma.PID = Guid.NewGuid().ToString();
+                            ma.PLAN_STATE = EnumGeter.PLANSTATE.INIT.GetHashCode().ToString();
+                            ma.CREATEUSER = this.LoginUser.UserID;
+                            ma.CREATEDATE = DateTime.Now;
+                            ma.IsNewInfo = true;
+                            result.Result.insertNum += 1;
+                        }
+                        List.Add(ma);
+                    }
+                }
+                //导入
+                cmDal.GetImportData(List);
+                result.Msg = "导入成功";
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                result.IsSuccess = false;
+                result.Ex = ex;
+                return result;
+            }
+        }
+
         #endregion
 
         #region 获取产品表
diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
index 2073f52..c74c419 100644
--- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
@@ -171,7 +171,7 @@ namespace QMAPP.FJC.BLL.TianJin
 
 
         /// <summary>
-        /// 添加贴车单
+        /// 添加贴车单 -- 计划外发运
         /// </summary>
         /// <param name="ppastecard"></param>
         /// <returns></returns>
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
index 998d661..53ae4cd 100644
--- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
@@ -718,29 +718,6 @@ namespace QMAPP.FJC.DAL.TianJin
             #region
             try
             {
-                #region 判断是否出现底盘号情况
-
-                if (ppastecard.DetailsCardlist.Count == 1)
-                {
-                    ppastecard.VINLACK = "0";
-                }
-                else
-                {
-                    int firstVin = Convert.ToInt32(ppastecard.DetailsCardlist[0].VIN.Substring(10, 7));
-                    int lastVin = Convert.ToInt32(ppastecard.DetailsCardlist[ppastecard.DetailsCardlist.Count - 1].VIN.Substring(10, 7));
-                    if ((lastVin - firstVin) == ppastecard.DetailsCardlist.Count - 1)
-                    {
-                        ppastecard.VINLACK = "0";
-                    }
-                    else
-                    {
-                        ppastecard.VINLACK = "1";
-                    }
-                }
-
-                #endregion
-
-
                 DataTable tbl = GetPastecardDeatis();
                 int strindex = 0;
                 int reindex = 0;
diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xlsx b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c6e265c88771294b5883a396dce1878bd57ccd94
GIT binary patch
literal 9343
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
Y7k@7+0r|^WQ9w{Ypr7RQ37_@;50n$@%>V!Z

literal 0
HcmV?d00001

diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xml
new file mode 100644
index 0000000..5443331
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/TJDoorPlankPlanImp.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<DataInfoMains>
+  <DataInfoMain InfoName="TJDoorPlankPlanImp" InfoTitle="门板发运计划信息" TemplateFile="TJDoorPlankPlanImp.xlsx" RecordCount="n">
+    <DataInfoItems>
+
+      <DataInfoItem ColumnName="PLAN_DATE"   ColumnTitle="计划日期" XPosition="A" YPosition="3" >
+        <Observers>
+          <Observer name="Required" ></Observer>
+        </Observers>
+      </DataInfoItem>
+
+      <DataInfoItem ColumnName="PLAN_SEQ" ColumnTitle="计划顺序号" XPosition="B" YPosition="3" >
+        <Observers>
+          <Observer name="Required" ></Observer>
+        </Observers>
+      </DataInfoItem>
+
+      <DataInfoItem ColumnName="LINENO" ColumnTitle="车型" XPosition="C" YPosition="3" >
+        <Observers>
+          <Observer name="Required" ></Observer>
+        </Observers>
+      </DataInfoItem>
+
+      <DataInfoItem ColumnName="MATERIAL_CODE" ColumnTitle="物料号" XPosition="D" YPosition="3" >
+        <Observers>
+          <Observer name="Required" ></Observer>
+        </Observers>
+      </DataInfoItem>
+
+      <DataInfoItem ColumnName="QTY" ColumnTitle="计划数量" XPosition="E" YPosition="3" >
+        <Observers>
+          <Observer name="Required" ></Observer>
+        </Observers>
+      </DataInfoItem>
+
+
+    </DataInfoItems>
+  </DataInfoMain>
+</DataInfoMains>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
index f12daeb..345012c 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
@@ -295,10 +295,10 @@ namespace QMAPP.FJC.Web.Controllers
 
             try
             {
-                dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt);
+                dt = this.GetTableByExcel("TJDoorPlankPlanImp", fileName, dt);
                 //格式转换
                 list = QMFrameWork.Common.Util.BindHelper.ConvertToList<TJOrderPlan>(dt).ToList();
-                serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
+                serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("TJDoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
                 if (serviceResult.Ex != null)
                 {
                     throw serviceResult.Ex;
@@ -310,7 +310,7 @@ namespace QMAPP.FJC.Web.Controllers
                         dt.Rows[error.Key - 1]["InfoError"] = error.Value;
                     }
                     ImportMessageModel model = new ImportMessageModel();
-                    model.InfoName = "DoorPlankPlanImp";
+                    model.InfoName = "TJDoorPlankPlanImp";
                     model.ReturnUrl = "/TJDoorPlankPlan/List?callBack=true";
                     model.Message = serviceResult.Result;
                     model.ErrorDt = dt;
@@ -347,8 +347,8 @@ namespace QMAPP.FJC.Web.Controllers
             try
             {
                 string path = AppDomain.CurrentDomain.BaseDirectory + "App_Data/Excel/";
-                string fileName = "DoorPlankPlanImp.xlsx";
-                return File(path + fileName, "application/vnd.ms-excel", Url.Encode("门板信息导入模板.xlsx"));
+                string fileName = "TJDoorPlankPlanImp.xlsx";
+                return File(path + fileName, "application/vnd.ms-excel", Url.Encode("门板发运导入模板.xlsx"));
             }
             catch (Exception ex)
             {
diff --git a/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
index 4b47c8c..c150b2b 100644
--- a/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
+++ b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
@@ -112,6 +112,7 @@ namespace QMAPP.FJC.Web.Models.TianJin
         /// 创建用户
         /// </summary>
         [Description("创建用户")]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center, Hidden = true)]
         public string CREATEUSER { get; set; }
 
 
@@ -119,7 +120,7 @@ namespace QMAPP.FJC.Web.Models.TianJin
         /// 创建用户
         /// </summary>
         [Description("创建用户")]
-        [DGColumn(Sortable = true, Width = 100, DataAlign = DataAlign.left)]
+        [DGColumn(Sortable = true, Width = 100, DataAlign = DataAlign.left,Hidden = true)]
         public string CREATEUSERNAME { get; set; }
 
 
diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
index d8dcb07..544f2f9 100644
--- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
+++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
@@ -428,6 +428,9 @@
     <Content Include="App_Data\Excel\DoorPlankPlanExp.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="App_Data\Excel\TJDoorPlankPlanImp.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="App_Data\Excel\DoorPlankPlanImp.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1302,6 +1305,9 @@
     <None Include="App_Data\Excel\DoorPlankPlanExp.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Content Include="App_Data\Excel\TJDoorPlankPlanImp.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="App_Data\Excel\DoorPlankPlanImp.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/5fcea1f9-ea55-4d23-8b98-78541fafab73.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b61d00d5d242a07ec086a3a435646413e12b4788
GIT binary patch
literal 9422
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

literal 0
HcmV?d00001

diff --git a/APPQ5/QMAPP.FJC.Web/Temp/af9d4740-7223-4f5c-ad0c-8ffb489a1603.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/af9d4740-7223-4f5c-ad0c-8ffb489a1603.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..018954876ac42bb23aa019adeb929b2b560a5dd6
GIT binary patch
literal 9440
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
XK>#2N^($CW!BD|q9_4ySp7j0?AoC<3

literal 0
HcmV?d00001

diff --git a/APPQ5/QMAPP.FJC.Web/Temp/f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/f3271430-e5e1-4ca8-b78b-2351c788f148.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9325c473e235a8eac293ac091948a85d3f20628b
GIT binary patch
literal 9376
zcmaJ{1yr2Lvc_E#+}+(FxVsFJKyY_=x8Uv`+=IJ@;1Jv)Sa5eI@F2On*>LyWK4<2i
zGgC7Cbyszr`dVHJ6buIFc?8OS=YM|wHK3n9=v(Q@+ge%M(aS%Hp*(#7^;680weyh+
z7zjuN1PBP}pJF=J)^yGm=IPNxlAw$zAFh0lkgBXE(2yyUQL;i{zSD?aG1?Wt8^%Pb
z2TmK=tO*{&tKYD}@CGDfj-D88kfp8T4F8~84VAGF2PHH$V&=k?qW~^ZFFK&gN$ft^
z_Kpb}PZ;Nb#atB3g{^GvJX_%gn?#Z*u3*eD6Xr9bDQ2Byiiov{Rcw@(lAfv1Ei10^
z%~PyreWzdDum7<Fq9Z{*;@*hx0DBAmp}xkxcq8;}_cXb72VyI`nuPTG5W7#lp=E-$
zH454s*eUm5`pxci4ne-`99H~Uuq3<9H4kAiW|&!@hKz~*63`Squ=nWG*?4u4tVSZs
z>939u<<dyoz4q1_xF%iYq?`F)E&Evrj6{bW`F{`vJ;@$0_{`^BAhZ&Z)q7wQQk`c<
z$UeSQ(`$0zRq41;P{g-cQT~XI|0m8F{aICi;f(xGob{}14W5Dah}M$oWI*X&25%SY
zcT2VJ<`i03#lKwVugJbei)p5v%_R(Wyt~Y=EO{-`C&jV#V0$Rh_^pKP253*efI7|y
zj5O1QJa<WDyGS(;HjZPYM%$twOAyl9SoPz__;2z{s?HVZz<Z<(BvCav-;|8ETC*_T
zw1IZ3qv3D`r4CbVc1~GV>fDE00FOW=>w#xLZ(`zk7bOQ73&Zdd4mDd4^IOBwQj9LG
zau1%=&-f`Hj`$R&am1fPzIMb~%cuf>d_{h>)ZagQ<uQ%UDBAaNE%D-qo;qv1>vjle
zaiFK#<~^5EV>E#!!bPn-Kx&KjES>hmN{G@qOuP|%Q-EYu;TH9zkQ=?;X$WRY$cnO2
z^2|jDDtxQ9OKgTiOOBs4|2mN)HIF21Fkrpr-Dv1{e`l~s#;d30;sgE@=%zB=%ZDd`
zy`DDp>py^Yu(P+a__?Q}hGhL2Fhs7%+Jq)NOp3DkVP5+rhr`O?7|BT{n+ST1qs3t?
zFUt0OY#pS(8tiXOv{;$~LtAZOY4SA@BtS|@71-4S*SdNWC$u6|9_Y!WreuwZXSusa
zeYqcoN+-T5AZ)DFp$JviHG38--zukDs>g&?aEm18)Mbc6ik`k&{fbLlvJZE&8c~$+
zF4PZQv(f*N2(oj;@u5P?V)D}*yE}LejBVkHSYoY4Vl>>C#aMP+E<BZGh?}sjps~<`
z#!1Bw|IZm8DZ!fFR^F}+Ds~|-BM#9NtP-dT(`Tjary`c+ljKmy#5U*v^lxZ8y)ZlZ
zU|2hi>IZEv(4XP@_cQ_e1ede<&jj)B0tmkZoUClk?2HWz>|Z7mpVqMy(kClTkU&5f
z|0VlVh4Fa-!j<PN7Z{M-=|{bguJLerzk??Dbw$L2&?2$$WMBr@1&e1(j;oB9A4SEX
z^wasaB#qk|IyR`6qrIhf*~Cp&Qb%D7zK?P)6&D@|)sXglm{pe!E?}Vrqy+nRug6o`
z*52QnC_vwoUWS<<!h8tn*W9zk1EZR&PNUL_EB!pI(wAo1GN6$u*>7wr;erPD<(R3D
zl0HZ=X)w|_=pcdIoHj;i80J8jWUw&6t9C2TbW(F1aVIZEg~M#EK+opDQLWY3ev^JH
z7)8>&_G1vY_4KeDC#+$s-DZFCs8>k5;*C26J%RdnYdP+<+bO(y#;)^JS!HEUWhy>O
zQ}lEYky!7YDFKt{@}hkG#tQah0>2HSjl%3kSGg(+>9U-gA5jFB$n6{@N?UUi=R45`
zG-EU(B}gMRpJS0mAg;l)MvdQlE93@miq+|=qQx#SHf=`^`G}D~&BHBjkuCJF4f&k|
z>hc1m%Y`pf3taJIF->%rMI1)1Ez5NbwuQ8C?0aA@<8f63hLYfJ8H2j?bz{hhgvjn)
zIoW08TGHCO^n+eE(v0;*LPSZMPwh@B$T;LG$b6ZPf{4gHHw)l{QCiLt`nK6MKid0X
z?>m!%aCS6GZ^ktpz<VBu%Qbw8-~pJZY#VEyTV{`p)*jNc*w$Mn;giE`P+M4FTdY?X
zS8%yDBJyi&64*`^EQv`$el<jHoYl3j1?mko02?QG-T;T*fxH+q8I%g4V>v0WQs8r8
zvU15%VFSDnqp~&(PG=GM#dHt-YAhwKj!b5fWh%9QyDL{H6L7!?;nB5=!?;g8y%nT@
zZ{rq$afOT>m^6pS*4^|5{+knsz}32O-sSq*<vLjiEVI|mnk@^~h~W=^cA;iFKm@9>
z1tHyCm;>#cfb?z9`#|q86}@?)G$Z!6>IECphx_*mnnVcT9LU_YV~*=t)L(^7*%`1U
zoAj0oznuuWU@rJ#-8LBPY=(PGXV)m$AH|MhlnpK5Epr6G1oG}%ei$8sjlozH%SX(6
zJ08<7_JAG>!Ym^mQJ(xGs5=)0AT>~Hv(d$-(w$`9-Zbd-|HtX`asCvi_QnPl1}~0t
z<Zx^DKnNh980=r!?{Bf6!asxWKvm8PTLh(@_ykwf&B}t@5lhUWc(xMTctW)D{p6Z6
z&r-UpqY*2!>@K!xq_}vHud9HdItM`}fZ9j+hJ{ijPy7c=OY)q?QI}av92D4OpuW>4
z`_ZG@nc?MWyc@C*q_FtFTEg4rcNa*(9=zE$qo<beuISS|B&ZQ$Nhe7)Ett_u@k36_
zjbZFc;zYjM9yILMgRt?EY*eT_oeT-+E`qvA*mlS|;N?VxVPL#qO~@ssN+o9TP!qF4
zj1k`ZLnleMU_6f}1&LZbr)<o-8W1$Pq!->J!deq#!>{~sWlXUMjjB4qxIUL|0Oug{
z;Y7I&2*F8#zosoW_0%*tvjw-x4NX$3s;ek7^4w{%?=Y^?bq>)^V*YfoJ0!Kh=>e*3
ziac}R_-0W}b_A&6$S+?dfoRCps&#tU7>)nZCfc!JzHnN@-REJ~_v?^j^P+Kn)w^s6
zef&Mx>x*4A53}wL?5J*bwBw6Qm4fQc75KjIGib-HQbV;(q3oGaW6o9H(+CF_fL%`g
zuXD1L?zk&^Qz*P*0xaued8%P9r3u|?{ztZBpxzKnrN&{CG=zHlLKsfgEGQ^u5YB!p
zU&3%tH@-w|e#oUa&Q@ExgARyGnsEEEzc4eBkvTJhhrj6MYX2CR1Bn=M=w)TX3F~By
zgM!|6dmFplevS0wa((bEA|G|{AkjnO5wGjRS-}Q>UuL5)J+IgO-b61wp2z)ZY9Q$`
ztxurHwYR8nHugHw!5Nf2bASygxsXjAsvnY~5jcX6BlJ!g4DL!erlCOtn@zaWd;Sv&
zP|fru2mOOU-C|?tEi;{UASX^E3pz=7Ynd~ucg_sqezu#sYF!6<?(#j&etNyNizXn-
z%&?NZm+4U)x`&K7)HqQ|6uDd1{!y<E4&`@e9TIPSrFd1g5kxGcrDT{gg~+2eLmiF5
zJd@*h;L04$tKG0`IjJXHQ*j!^#i71R`r{*QCY?}aP~pT!<E#Xs!h7PDR7m$dNMDPn
zzok01=f@CRM2@a9ACdvSMN9L97iy()xT8xIp#xBGQRcYd+Gz?~o=K2*DF6ZvCOBwx
zmt$W;DTG}%Q28C%vJ0KRxd!f)TJ%VL)w@WJ?)#p_S~vwVC?h%Km6j&yx8UW6uy963
zWeCY8#Uf&?N7Xq)l-;_G<2v*D7TVdaff%E$ca@p}cjyV*7Tn=iQ2O29(Jtx)+dqvi
zd9?}B4{n^551s+wl-1Zt>Sox|ooZ@M@DzJ)O?&zrOkAy?u}2Fb{an*I9b)bY68w(~
znK3aq8u+!VA)w26GpY6iIegk$H%*9qq$MC<k*a@j8G}n4pLX8<5zk}6cFx(Qf)G4K
zhd;Nf%#()8Zp$QE{5j2pS+peOvq|zNP03(iORF!X`5(Ag>r;@2P(%XXmsPP<awhuq
z+f8XR)RWn>LEREooMNTjv6^ulX^V=^A5M!UzYjwno)BT`B96Hg-)r5@NwEQ-QNxB9
z^O!SiSFb^<P+OasR(bg>n4~G`zt#FecebQ;0zm7qqX({C+v)qRYg>hZTi0T!m$yoY
zPflwECuZOr_UgE4a)`tbSe@fWa<+nxF<B;Iq;>8qid}3bL_PlWAuP-r2Lfb(g&yYo
zD1)L2RK+{Hs?&0o&!t;={1U8O=_n<8NN|ryDB5B(wffv-ZB$&%4A~Y&S`&bQf{-9j
z4lZFKHq<+eZ{<R$=a>r6?0ES^+vp7$6Vq&pmNv4nWzLj_){Z#UBwZ$rQ<NzNRUcA)
z;|8^tV7~iU=2c;D43~vS+}Hu~FnS)DmCrpv-XfI{9{}T*1%iumDXQV2Q?1K?h>5!8
z0S@;o!bPIB?uMN}QnHq?c!0Idd|XJYW|3CwlmHw|071jtMZ<s-y2&R<pQrPeCLC%c
zkVru%2T=u4zox#7!a-siWwn+$I>3V=oRnde81(MIjpV!H8OqejOij~m<BX?ScC$dZ
zUrdjbF_a(p)R~{vzyC2bsUGr7W2%gOu)4LrFeoFbUiE^8+FMnJ+Bo0jF@Pw|rlc0t
zOkgculnlq&MnMnbD|R**T};#i=p8;PFELrzMF7{zo&0-b_x8~)0&{|5`q>`P9S{@9
zz)_Al0c`1%I97{!E|U_2)C*3hCeCHOp6QtMo@FBz$ECE!{WNuMIlTfjM{|qbgcK}p
zH*OIf<1}3TFukt@Ro{DQcw1m2mI6i~6!UZQEcjEsfc~u76|7jh7M_Yu4P_u8_+Q7H
zoxO{>f!%YtIHhh8x$qA4A)?Ex0?-i{lFSitHk~fLqu=vt+*idkItoZRqbs>`y-Vo3
z5_4!2%py}op?D$ehbc*#W~vQPTx|h)+J(c9CgWepA3(O2%$Cu&ZVe1|drfj9)~;Ll
zw!XP}M7BDdIj>M$m5$9i1|9$m6lp1^EA}q;R|T5S7vJ=VR_BKC*v&HIIvLkWkxw_+
z+ufCD&0)EbM>yP#R&j&BgX=vQ&)ULWq)6;t6f)C}U|%FQgK9rt9Q%B}vbUYd&5NaK
zXcZO&A*-r5<?5n6-#LCcZOz00vGi`IDK=|{Zs$Bs(DOzGQP!07gY{kmkNig2=>@)w
z`q8IHkDE9g^|xgnYxArZWv2=21^DJ&_u|{^efZLkL(P&!INROSSp|x^is3WFr%nR#
zsqAa<MgH-t8rB-C7Hx-a)bY_%P;EZbajb8UbDZWP4=+`gajOW-l!KVKs#{q--!>X?
zdAGyZy3RO!i~bHAMlf*wbrk2_ddSXPxn{e2SUDGqm>xeqVd?HRPEUr{#%H`HV*4s-
z{iw&QF=d|`u3Ju8D<61+EY0+81B;&QSlawzx&euTd(`zXgv$lePH*AzLMc=-f19z2
zU6JgVeL(@W*C%KMP5LIU@v_q_CX<UzF^b??T-VibQGM&BbsSq9;6XhSC>c7^Wf&?N
zmCOfT4dY#w>cK)VhGj^_r~QEH)hLwB7Z#4A!S_{ulElmf^Xd82V;KMrMsA%zN$cl-
zB&CF#Xr>m%fKt~3nBWwBSE5+HVW`>zrApHY@sOyBFp0EfP7qAaq?hD67a?TyO_>|h
zk9py}SpJr3P8P5h%H#ELKeBXpKm`cDX*@D%R%GL?wtj{Zi@6w=Z{^-B4+|;x_VH`}
zBx^S|HI%~CaFvp&(#g~zL#c9=<1nk`_9V1fE?$kzF!2&=fA@DlpOknnwJ!~)laiIK
z?Q&Girm1LU%4_8NsuLq2d-l6ol9F$-`{}RJZ!^Z`27B|=H`lQNTs00@E^`A0CT(@M
z6ZFF~tl}S4YUhg0<Vz>h#_MaT)bB25lJDbZN8-!l*K4z~<ak|%Zd^&<jhG0pNM1;O
zUH_IwpL-wo9pEZ*xy5vBm)smP5PiWC10RsCBAeVvXhcf40kIa}w?!q^c4|_3<*1hK
z4&f)-qw5}PIW<a-uWD?t*jRCQO!PXT_U^C{@=i6RJzhycM?zxQ!irO6*)N-|3K3yU
zYlKITboheX2?&yBf!jJTA2e{oo9H@}LWdacvSpt12<b>Qda9B0MBOVfJB;qMkz6y>
z;WHJ9CX6YB8kwe4m_!}8d7KO33SWimr9Mywu_&FatwRmU40hA}sF@nBocm{^zG(D#
z+#r+|N$~7<;`>L9u^zo@lac;(=~#dc-fwfb!(Ewl01|)4Xnx(ym2i=enzD%M=tWaG
zGh(smVbKVJyl@;5HEeq5jZl740b!_c&jvWqOSI$g&dFqCf2m;xytrVNP(mq^XfWDn
zGK*P|_Xgt2W22DaY$jR#3N-V{1cJH-AR=ku52L`u3NyB83&wrdnjaCwSSRPLzin~B
zWUhf&$mAeE+C$Z={19R~kD_0J_6a%{BvGK;9E-No1#<eD>JAFLzkq;8Gk5hq!h-?l
z9e2kY;+g6uyhB6*y&_C?-+58)=FrQ7W`3RMq02Q-aphs&NtKm_f)0}<{_I^RGCvP9
z{gnjde5E!?741vOTK{h7iC1mf=mWK1KRa+)vZ;nr>@}bo&??1)zN&lOAm7Q#m^F+Z
zRgnUF3>7;^L|L@Po8<t@B}vr|qpY3RciJp2uoW^2u4}oj@eP^nHDq}<ywIqDD6+i%
zmapZjEtM?z7#%baB*nt6EIvQv5XERIYMn`cDP5MY^>JTl7YQzANRA5yKP3<B6)<9{
z%zW*~G7Y#CV+0-mI!Ur;_6H_f@Rbi9sQX^nH$_8{TUuNuGz0>KLNc0$p7lOA(^B~C
zjz9;ANws1%5JSu`jhI1cpmxBcGT1beFMgr{8h{#+T&}Iw#H3~8gh*xmHI52UXG`JN
zsk<9=*b0{ECzMYT_Kk6D$YFoQm$ndU3pSf5u`vquYp{qQF;%ZXZta%@L%Qj`s2Me#
z*Qs{772-6nNH}q+&9d}$(5utPR~4FkRR}D(g{2a76C`B&iy7uoSZrY2W?};Mbs$CP
z=D%=dig$?SF=8|b1*y*?sOu<nfkQ18)4C7wzX|A8iW%wsqMHuOuI7w35vxi{LgFNx
z5m<je79aec_AM1cWmDXZCB*o`=UP_&3{k5)u`}g}yVHjNr5=E370LSHB!PwWe1Y|L
z#J*F9gG4$Eml`c;69<X1IRw!C_l=!+hyJg?g<{C;(_O5l-k8XR=by?23_1d0aPw)t
zYK9;%O4zGDyzv|io7}A6#seq_aWN2?@TXJt#%=GuW2N)+M6lUm)o7K?bnJ7(-1E00
z(W;dMlC>82@M_>9I9NlsW`%0o1NdP4ygT%!`U=FZ<M2oD!RMT!8s7lu%|}-@kCTa`
z5<WO%AQK$;Lmb2j<K3A!c!S&St+RH%q#uX&xA*-w<oH8gH_0H-a`#~>HqzGdEeOQh
z_GilJ?XKJ&*DRSpfC!L7Uf&CyM&TK6kbE#4a8E&EX$Ft;m5V{K39bA4`%XlT*JGyX
zCV}`4h>E+xWZ6Zp^Z?y*7XFRWk9KIrp=9IxwlceKH5a`RWUw)DU7!W}qA!Fs#x!_(
zgcILfEhCQLx2OC_5e2(KW~4HKTfSdKb#}U}M+9*=QBOl&4FpDOJ)OJXA3P&Bvf_2O
zY9mngkC^;a?e(y6f9^pA@JA@5^^whu<j3)$IXuu!d7D>}<l*l6(0_#Logqge7|acc
zTj%s}KQgi0f*8znw_P45?~m9Zlg$z>Dj^J|oZFVpcZZ_R-26yGBI}O~M-=@Xg==!f
zgKHCc7Acf0+p>!%6(<^HJ9;d$>V)KDrH^NV@m%R{(5w$>qCW+I4W6n^p+{fHFV7#o
zShL_GWMxOa8z!_dJu&CqL~1p8oUlK_x9gawue_~%cWV<nIm@#6yh$GS;CZNHpfFO#
z#3d|9cgkwQN-`;&F-#-Av|nJB5DCZpl;TCOyRyOX;zoxbY`B^qm-)5am&4DhSU~gT
zw8r<kE2U#WuJ0d4G~1nJpQd2~fD&;<6O`nJ%|N0mQ>yB!MtM9gX37BG9~5tST?DB|
z><foOq4Sz^nvsoYNxS*&7cu}gOk!~m`zcqQb#2&WKqYjREP`Ls95mc?i=6;%FlWs6
zC=4($#R$-C3Mm}XkB-@(YkyA<=u~kp1~wwYtW}jSqPhqo)TUz_TadPa-;?vQDOnIs
zzhD&6zb5wuBsTF?Ni(w%Q8<_sOMcDYKm>y|l(M54$LSIE*OP$>5Vym?Mvh~p#OOQE
z_&|`YA1gm*qfizz68eQgh3JASnX3Yur-J1~+W9L2U#H*<Srk4`iIptQ5yFp34c*@5
zo=60cnER5Y%A-a+!!f!_JzG?SP>20io`5Z~)p91xxr6b@D@UwPi#$RL#>H=j;9E_n
z*wkv%7sFGQ=H?bz)r#{SJwYxoTAj{&Y(%u2ueLuQMtrMWxMFKQ)-PB%TF@{%Imr2B
zOYQtf!O+O)xKbQ#Ra$;;;aH~ey{#oYgP_}(!f(DJ2{w!(a>q@f{t@xdDj4`XP%!*c
z-#X^$^-R$`b#Ls9b!-jv742<JERB8^!xm8jPdouez>)7G;kxAn<z7AsCdIZ3gBQQ?
znwoL!d~UXw92H)%FG2?;4~46O)ffI-BXjk~4^xDKizgl*w?0H7UR~xO?VkvP1CVB`
z%%K{r^U#9`eHQ$N^60=MnO7_2VPsc;-&TmBqgMd1Cf{d4o!3UpAOXroi1TSM?G$2h
zlZB;c7%_=Z$<tg0w$#N4)#@xDMQD(a8kkU1J}W~3koWW5*Vq+HK|)wRiAEZ#$Iac;
zaHR5XZJczAMW=S6hp}{TFC@D#8;V|SZd&q|oJw%^59}Y{dwNk=$)z4_^~W|gWfVNB
z>(FVH<dkymUZu*ER2w)f;11TkEp=FdOUoa9pqBrkcnkg~e7i>?sLW5$?L55@f484?
zt*p#`cAcXc<vJOVJ~)v)_-&+<$zUsGlf}ym!~r`{7_gn>Rhr(>ERb$2+es)5^nE{T
zuI6oZ(<~bnt)@Q~$fCWmkFkZQ6D``$T0d&uY6dqVgrWW*3QPJJ@cHf3!BCZu*S#<|
z6UeOmDVyk95{bh13`EkSK6w&;OF`n}_%SQoP?&1o#`ZCJJ080JRqiAx4}5UuSjwGP
zd$GXSVnL9!M01FrY<=Diiki$uVl%FOOJ!KUE9IOZ>LM>9>Wdi>*M*!B9Zu$J?2R2~
z@kq+Ulq+5)t<Ml{KhP9FFZ-ccC94{|7#LGY>r(eFH*R&-4cNh$xI1OztY(YU3quI0
z3yZ4SZ*XxBYs{*)qW57ILu}{D$D(gC4hJoS&Xc$R^uV|9Ls@;sg@H52$1PRfmWF%4
z1?d0ZgM8{S0%_SAn7^a|+&COt9-n?&e&Q2h|CXV9mi!bmBH6`&)N}MiC2qFKIH4lX
z+0zs4%jkP}CrLk!lD&>mJ!oqcP@tJ?f{aYQ*-Tw_*KfvNB+z8ck7)6AQ1Ioq>T_&U
zICgh_x9BTg+Bya5qGbIAta<lT_s-vMlRIvnjwD*c9Wcri_=YmpWNb%Cp8w+;R*?cu
zK0RVTwpL4d%YjqTo{xC)GThxuR6%ad5H=hiT5hbYiuZ<Bc#?C3MwqGBm7>!f%%f1l
z{M>V9+mS9rARstLY#n$9kDMd}OFtRX!i%VXNKy>>wxQl`LzCRAE{h*RnmKgCKQXcO
zr6YRmea)aamp^It-XjT9Z`XQ)3oomdxa}!ziPQg&<$wCQ{|4vAaW=-m6O2tyaAG|@
zpEANPv1bnEuZ{f|x~82Ba6LzUt$t%3Hsj%pqUoAFnKPf<fb^)njCCQU-lx`o?8{Qk
zv`<ur`{>_(L_WB%*myLFNM@?XAg|9!0Y`VsHVM&&aD+&o8Dw!>7YYm?CSE~(bX12w
ztC}D+Sp!OG1FfH_gQr<bHluAt843!qqr`ZTAd;_!IE`x&?i#x_!u8|A+jh0+a*2Qb
zj$A&_CTjh$RZqDVVLAKmknuPkN+w)pn~$^KnWTqpst*EfLpn%6E6_z9HK12k(=I>h
z{L}SN$_dSzFPt7Ru3Vw-;kr}c3X&ow2~NM-P)3_eaiL?hUfXQEXnGf(sM#4k#XLOt
zucr5VAuCIJ150}?B^PT0JB{bq{}eYU3&MyJ@I?7_=DufEwAKmJ(OxwuBKZzFdHI>;
zJR!sP_%ef18$`e-ELDQ*;HLfYz7<ZC+AM@rcyei~RO{j$u&is|VyPj1Y~pDKYLdU=
z7iUP;_n=i{$G4^os*s<3i*ct*B`CSABdUO@D^7uNhNL}eh{hO(osn$m3_n}BwZ5Ti
zm0AHLtHHD3aCa!tNK<9JJ$G9p@fA?vwnVEdO$kN{OCX9?Y_s3>23SI)DsQsRZhN!q
z`<>+YJ8n9Ct~(6R4ptLjL}P4)kz#8&wZ-w^mklUxSB{uHpD0S;$AXnYRvN7<<&XCv
zAtZz6%Xrk6!e6z$rpu|j)%^|<Tc5~`h?StaDSbU)Z7vLUkwKI$zAxR2BtT&f6vH}|
zad}vX6WV$aJq_`&$dAS&AZuUby=B#I2c)_Qc0Aa7Q*d=QT+vxWc`*QUFubxwD>&~_
zyt8!C7G2j)({k2vrpI;<Auk0Cg7Wj|`gObD<;pzmU?5;1f~WUAJRqQdS*KqH{+)e%
zPC38E^F;+koZkuPPp2<a(6i1jr%r$C{0y1@<?J~oe~o8n&*L8#DE{>K@(RVX@GpPl
z|5W?Wg^HIDy}TIkTRZY;OaJZkuWJG?)nC%xztyjwQpRufzsc|aHR)#p_}6%zG&$IR
z=-}t+{`->riPA^he<Y}vfAnQ0d-n4SrJjGP{a0RlY3F5)^xIAi=D$}=FD<<6HU73x
z_C#<$*Ia*h9{(3uf6jg6iSquNY<ubPB`f#a<K;iqesgp$4ZN&uej7M@Iu)M${u8$U
z^{1a1{9ogFg~flZ@E?5spL_cyqyMb?Yt`)kOZPXwFE0iDGgy&<kbxkd<opPp_5Kfa
C<0St8

literal 0
HcmV?d00001

diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
index 448c090..1bd3ac7 100644
--- a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
+++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
@@ -181,9 +181,9 @@
                 <%=Html.QTButton("insertorder","Insert",QMFrameWork.WebUI.IconCls.add,"Insert()", QMAPP.Common.Web.SystemLimit.isLimt)%> --%>
                 <%=Html.QTButtonDelete("DoorPlankPlan", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%>
                 <%=Html.QTButton("publish", "PutOut", "detail", "Publish()", QMAPP.Common.Web.SystemLimit.isLimt)%>
-               <%-- <%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%>
-                <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>
-                <%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%> --%>
+               <%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%>
+                <%-- <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%>
+                <%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%> 
             </td>
         </tr>
     </table>
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index 4818090..1038834 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -36,7 +36,10 @@
 
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>-->
+
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+
   </connectionStrings>
   <!--日志组件配置开始-->
   <log4net>    
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 84a3205..c6bfd5c 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -8,8 +8,11 @@
     <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
 
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
+
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+
 
   </connectionStrings>
 
@@ -123,6 +126,7 @@
     <add key="UpperBarcodeLen" value="20" />
     <add key="LowerBarcodeLen" value="5" />
     <add key="PlaceFirstPositionCode" value="FirstPosition" />
+    <add key="PlaceFirstPositionType" value="False" />
     <add key="PlantNameConfig" value="" />
     <add key="ShowDataCount" value="6" />
 
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
index 4c3e338..18752d5 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
@@ -8,3 +8,4 @@ CARSETDESCCN	String	100
 CP5A	String	100	
 PASTECARDNO	String	100	
 SCANDATE	String	100	
+PRODUCTCODE	String	100
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
index ee270df..7684142 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@@ -45,6 +45,9 @@ namespace QMAPP.WinForm.Forms.TianJin
         QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent();
         List<BarcodeRules> _barcodeRules = null;
         public delegate void myMethodDelegate();
+
+        private string PlaceFirstPositionType = string.Empty;
+
         #endregion
 
         #region 变量
@@ -67,6 +70,9 @@ namespace QMAPP.WinForm.Forms.TianJin
         public TJFrmPlace()
         {
             InitializeComponent();
+
+            PlaceFirstPositionType = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionType"].ToString();
+
             _barcodeRules = _agent.InvokeServiceFunction<List<BarcodeRules>>("BarcodeRulesBLL_GetListForSend");
         }
         #endregion 
@@ -754,11 +760,11 @@ namespace QMAPP.WinForm.Forms.TianJin
                         //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置"
                         if (pFisType == "01")
                         {
-                            strprodtype = "( 混 )";
+                            strprodtype = "( 左 )";
                         }
                         else if (pFisType == "02")
                         {
-                            strprodtype = "( 单 )";
+                            strprodtype = "( 右 )";
                         }
                         //提交数据处理
                         foreach (DataRow dr in tbl.Rows)
@@ -805,7 +811,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                             nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
                           //  nfpastecard.
                         }
-                        int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard);
+                        int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard);
                         // 打印处理
                         TJFrmCarCardPrintShow frm = new TJFrmCarCardPrintShow(nfpastecard, strprodtype, "手动");
                         frm.Owner = this;
@@ -813,23 +819,6 @@ namespace QMAPP.WinForm.Forms.TianJin
                         frm.ShowDialog();
                         isprint = frm.isprint;
                     }
-                    //if (isprint)
-                    //{
-                    //    nfpastecard.DetailsCardlist = nflist;
-                    //    nfindex = 0;
-                    //    // BllFisOrder bllFisOrder = new BllFisOrder();
-                    //    //int strindex = bllFisOrder.AddPasteCard(nfpastecard);
-                    //    //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
-                    //    int strindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard);
-                    //    TJPrintPasteCard prin = new TJPrintPasteCard();
-                    //    prin.Print(strindex, nfpastecard, strprodtype);
-                    //    GetInitData();
-                    //    DGVRemoveRow(nflist, ref ncslist);
-                    //    nflist = new List<EPasteDetailsCard>();
-                    //    dgvNF.DataMember = null;
-                    //    dgvNF.DataSource = nflist;
-                    //    //computenfncs();
-                    //}
                 }
                 else
                 {
@@ -980,7 +969,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                 nfpastecard.FailLog = log;
                 nfindex = 0;
                 QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
-                int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddPasteCard.ToString(), nfpastecard);
+                int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard);
                 //BllFisOrder bllFisOrder = new BllFisOrder();
                 //int rowindex = bllFisOrder.AddPasteCard(nfpastecard);
                 TJPrintPasteCard prin = new TJPrintPasteCard();
@@ -1040,7 +1029,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             if (openConfirmDialog
                 && string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["AlertConfirmEnable", "0"], "1"))
             {
-                Common.frmAlertConfirm alertconfirm = new Common.frmAlertConfirm(message, "CD85010800");
+                Common.frmAlertConfirm alertconfirm = new Common.frmAlertConfirm(message, "85010800");
                 alertconfirm.StartPosition = FormStartPosition.CenterScreen;
                 alertconfirm.ShowDialog();
             }
@@ -1126,21 +1115,20 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                             dgvMATChange.Rows[temprowindex].Cells["STATE"].Value = "1";
 
-
-                            break;
+                            temprowindex = dgvMATChange.Rows.Count;
                         }
                         else
                         {
                             SetContainerItem(nfindex, false);
                             Alert("条码错误：条码的零件号与FIS队列零件号不符合。");
-                            break;
+                            return;
                         }
                     }
                     else
                     {
                         SetContainerItem(nfindex, false);
                         Alert("条码错误：条码已扫描或车型不符合。");
-                        break;
+                        return;
                     }
 
                 }
@@ -1148,9 +1136,11 @@ namespace QMAPP.WinForm.Forms.TianJin
             else
             {
                 Alert("扫描条码重复，请重新扫描。");
+                return;
             }
-            SetContainerItem(nfindex, true);
+            
             CreateNFPaste(Code);  //创建NF的贴车单以及明细
+            SetContainerItem(nfindex, true);
             if (dgvMATChange.RowCount > 0)
             {
                 dgvMATChange.FirstDisplayedScrollingRowIndex = nfindex - nfindex % 4;
@@ -1177,74 +1167,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                 }
                 inputstring = txtCode.Text.ToUpper();
                 this.lberror.Text = null;
-                #region 使用登录码快速切换用户
-                //使用登录码快速切换用户
-                //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text, "^<\\w+::\\w+>$"))
-                //{
-                //    var ret = ClientContext.CodeLogin(txtCode.Text);
-                //    if (string.Equals(ret, "登录成功！"))
-                //    {
-                //        ClientContext.SetUserAuth(this);
-                //    }
-                //    lberror.Text = ret;
-                //    ArragetxtCode();
-                //    return;
-                //}
-                
-
-                //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text.ToUpper(), "^>CMD:\\w+$"))//扫描输入为指令码
-                //{
-                //    ExcuteCMDCode();
-                //    txtCode.Text = "";
-                //    txtCode.Focus();
-                //    return;
-                //}
-
-                _CMDConfirm = "";
-                #endregion
-
-                //#region 原校验
-                //string PastNOConfirmEnable = QMAPP.WinForm.Common.LocalSetting.Settings["PastNOConfirmEnable", "0"];
-                //if (System.Text.RegularExpressions.Regex.IsMatch(txtCode.Text.ToUpper(), "^" + WORKCENTER_CODE + "\\w+$"))//扫描输入为贴车单号
-                //{
-                //    if (string.Equals("1", PastNOConfirmEnable)) //贴车单确认功能开启
-                //    {
-                //        GetLastPastCard();
-                //        if (string.Equals(txtCode.Text.ToUpper(), lblLastPastNO.Text.ToUpper()))
-                //        {
-                //            lberror.Text = "前车贴车单号确认完成！";
-                //            SetPastNOConfirm(1);
-                //            ArragetxtCode();
-                //            return;
-                //        }
-                //        else
-                //        {
-                //            lberror.Text = "前车贴车单号确认失败！";
-                //            SetPastNOConfirm(2);
-                //            ArragetxtCode();
-                //            return;
-                //        }
-                //    }
-                //    else
-                //    {
-                //        lberror.Text = "贴车单号确认功能未开启,无需扫描贴车单号！";
-                //        SetPastNOConfirm(0);
-                //        ArragetxtCode();
-                //        return;
-                //    }
-                //}
-
-                //if (string.Equals("1", PastNOConfirmEnable)) //贴车单确认功能开启
-                //{
-                //    if (!pbPastNoConfirmed.Enabled)
-                //    {
-                //        Alert("请先扫描前车贴车单号进行贴车单确认！");
-                //        ArragetxtCode();
-                //        return;
-                //    }
-                //}
-                //#endregion 
-
+               
                 #region fis区是否有记录
                 if (dgvMATChange.Rows.Count == 0)
                 {
@@ -1260,10 +1183,8 @@ namespace QMAPP.WinForm.Forms.TianJin
                 if (this.dgvNF.Rows.Count == 0) //第一个码必须先扫描1号位
                 {
                     string placeCode = txtCode.Text.Trim();
-                    var sss = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionCode"].ToString();
                     if (placeCode.Equals(System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionCode"].ToString()))
-                    {
-
+                    { 
                         this.placeFirstPosition = placeCode;
                         this.placeFirstPositionTime = DateTime.Now;
                         this.txtCode.Text = "";
@@ -1274,39 +1195,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                 }
 
                 #endregion
-
-                #region 一号位时间校验
-
-                //if (this.dgvNF.Rows.Count == 0 && !string.IsNullOrEmpty(this.placeFirstPosition))//超时判断
-                //{
-                //    double timeOutSecond = 0;
-                //    //获取超时时间设定值
-                //    //DataTable dtTimeOut = new BllTimeOutSet().GetList();
-                //    DataTable dtTimeOut = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetTimeOutSet.ToString());
-                //    if (dtTimeOut.Rows.Count > 0)
-                //    {
-                //        timeOutSecond = Convert.ToDouble(dtTimeOut.Rows[0]["TIMEOUT_VALUE"].ToString());
-                //    }
-
-                //    //获取超时时间设定值
-                //    if (timeOutSecond > 0)
-                //    {
-                //        TimeSpan ts = DateTime.Now - this.placeFirstPositionTime;
-                //        if (ts.TotalSeconds > timeOutSecond)
-                //        {
-                //            this.placeFirstPosition = "";
-                //            this.txtCode.Text = "";
-                //            this.placeFirstPositionTime = DateTime.MinValue;
-                //            lberror.Text = "扫描本体件超时，请重新扫描1号位！";
-                //            //处理条码扫描文本框
-                //            ArragetxtCode();
-                //            return;
-                //        }
-                //    }
-                //}
-
-                #endregion
-
+                
                 #region 请先扫描1号位
                 if (string.IsNullOrEmpty(this.placeFirstPosition))
                 {
@@ -1315,31 +1204,87 @@ namespace QMAPP.WinForm.Forms.TianJin
                     lberror.Text = "请先扫描1号位！";
                     return;
                 }
-                #endregion 
+                #endregion
 
-                #region FIS区域数据全部扫描完成，请获取数据后再扫描
-                if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count)
+                #region 计划外发运
+
+                if (inputstring.Equals("FIRSTPOSITIONTYPE"))
                 {
-                    Alert("当前计划数据全部扫描完成，请下达计划后再扫描!");
+                    if (PlaceFirstPositionType == "False")
+                    {
+                        PlaceFirstPositionType = "True";
+                        lberror.Text = "关闭验证！";
+                    }
+                    else
+                    {
+                        PlaceFirstPositionType = "False";
+                        lberror.Text = "打开验证！";
+                    }
+                    this.txtCode.Text = "";
+                    //处理条码扫描文本框
                     ArragetxtCode();
                     return;
                 }
-                #endregion 
 
-                #region 长度校验
-                //string pp = System.Configuration.ConfigurationManager.AppSettings["UpperBarcodeLen"].ToString();
-                //Int32 ul = int.Parse(System.Configuration.ConfigurationManager.AppSettings["UpperBarcodeLen"].ToString());
-                //Int32 ll = int.Parse(System.Configuration.ConfigurationManager.AppSettings["LowerBarcodeLen"].ToString());
+                if (PlaceFirstPositionType == "True")
+                {
+                    #region 校验是否有重复的扫过的条码
+                    if (dgvNF.Rows.Count > 0)
+                    {
+                        for (var i = 0; i < dgvNF.Rows.Count; i++)
+                        {
+                            if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == inputstring)
+                            {
+                                SetContainerItem(nfindex, false);
+                                Alert("该条码已扫描!");
+                                txtCode.Text = "";
+                                txtCode.Focus();
+                                return;
+                            }
+                        }
+                    }
+                    CheckDataBase(inputstring); //检查T_PP_TJFY_WORKORDER 是否存在条码记录
+
+                    foreach (var rule in _barcodeRules)
+                    {
+                        if (System.Text.RegularExpressions.Regex.IsMatch(inputstring, rule.REGEX))
+                        {
+                            strprodno = rule.MATERIAL_CODE;
+                            strmouldcode = rule.REMARK;
+                            strcarsetdesc_cn = rule.MATERIAL_TYPE;
+                        }
+                    }
+
+                    //主键
+                    strFiskey = Guid.NewGuid().ToString();
+
+                    CreateNFPaste(inputstring);  //创建NF的贴车单以及明细
+
+                    //CreateNFPaste__();
+
+                    SetContainerItem(nfindex, true); //变更右下角位置颜色
+
+                    txtCode.Text = "";
+                    txtCode.Focus();
+                    return;
+
+                    #endregion
+
+
+                }
 
-                //if (txtCode.Text.Length <= ll || txtCode.Text.Length >= ul)
-                //{
-                //    Alert("条码错误：条码长度不符合要求（" + ll.ToString() + "-" + ul.ToString() + "）。");
 
-                //    ArragetxtCode();
-                //    return;
-                //}
                 #endregion
 
+                #region FIS区域数据全部扫描完成，请获取数据后再扫描
+                if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count)
+                {
+                    Alert("当前计划数据全部扫描完成，请下达计划后再扫描!");
+                    ArragetxtCode();
+                    return;
+                }
+                #endregion 
+                
                 #region 校验位计算
                 
                 if (txtCode.Text.StartsWith("052"))
@@ -1374,11 +1319,43 @@ namespace QMAPP.WinForm.Forms.TianJin
                         }
                     }
                 }
+                
+                #region 底盘号间隔校验
+
+                //2016-10-31 闫永刚
+                int scanSum = dgvNF.Rows.Count;
+                int lastvinNumber = 0;
+                int vinNumber = 0;
+                if (scanSum > 0)
+                {
+                    lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["REQUESTID"].Value.ToString());
+                    vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString());
+                }
+
+                if ((vinNumber - lastvinNumber) > 1)
+                {
+                    var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo);
+                    if (dresult == DialogResult.No)
+                    {
+                        ArragetxtCode();
+                        return;
+                    }
+                }
+
+                #endregion
+
+                #region 判断当前扫描过的数据集合中是否有相同条码
+
+                //判断当前扫描过的数据集合中是否有相同条码
+                CheckDataBase(Code);
+
+                #endregion 
+
                 #endregion 
 
                 //规则
                 bool signal = false;
-                string outSourceProduct = "";
+
                 string MOULD_CODE = "";
                 foreach (var rule in _barcodeRules)
                 {
@@ -1386,7 +1363,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                     {
                         signal = true;
                         ProMaterial = rule.MATERIAL_CODE;
-                        outSourceProduct = rule.DATA_TYPE;
+
                         MOULD_CODE = rule.REMARK;
                     }
                 }
@@ -1415,56 +1392,8 @@ namespace QMAPP.WinForm.Forms.TianJin
                     //-------------------------End-----------
                     #endregion
 
-                    #region 2.判断成品  下线时间校验
-                    //if (product.STATUS != "0")
-                    //{
-                    //    SetContainerItem(nfindex, false);
-                    //    Alert("扫描的不是合格成品,不能进行发运！");
-                    //    txtCode.Text = "";
-                    //    txtCode.Focus();
-                    //    return;
-                    //}
-                    //if (product.OUTFLAG != "0")
-                    //{
-                    //    SetContainerItem(nfindex, false);
-                    //    Alert("扫描产品已出库,不能进行发运操作！");
-                    //    txtCode.Text = "";
-                    //    txtCode.Focus();
-                    //    return;
-                    //}
-                    //var StorageTimeLimit=0d;
-                    //double.TryParse(QMAPP.WinForm.Common.LocalSetting.Settings["StorageTimeLimit", "24"],out StorageTimeLimit);
-                    //if ((DateTime.Now - product.CREATEDATE).TotalHours < StorageTimeLimit)
-                    //{
-                    //    SetContainerItem(nfindex, false);
-                    //    Alert("扫描产品下线时间不足"+StorageTimeLimit+"小时！,不能进行发运操作！");
-                    //    txtCode.Text = "";
-                    //    txtCode.Focus();
-                    //    return;
-                    //}
-                    //var mcresult = agent.InvokeServiceFunction<DataResult<MaterialClass>>("MaterialClassBLL_Get", new MaterialClass { MATERIAL_TYPE_CODE = product.MATERIAL_TYPE });
-                    //var mc = mcresult.IsSuccess ? mcresult.Result : new MaterialClass { };
-                    //if (!string.Equals(mc.MATERIAL_ATTRIBUTE, "2"))
-                    //{
-                    //    SetContainerItem(nfindex, false);
-                    //    Alert("扫描产品不是总成件！,不能进行发运操作！");
-                    //    txtCode.Text = "";
-                    //    txtCode.Focus();
-                    //    return;
-                    //}
-                    //FJC.Entity.ProductIn.ProductIn inrecord = agent.InvokeServiceFunction<FJC.Entity.ProductIn.ProductIn>("ProductInBLL_GetInRecord", Code);
-                    //if (inrecord != null)
-                    //{
-                    //    SetContainerItem(nfindex, false);
-                    //    Alert("此产品为退返件,请更换总成标签后再发运！");
-                    //    txtCode.Text = "";
-                    //    txtCode.Focus();
-                    //    return;
-                    //}
-                    #endregion
-
                     #region 4.与FIS数据匹配
-                    //4.与FIS数据匹配
+                    //4.与FIS数据匹配 匹配到计划后 开始生成贴车单
                     FISDataCompare(Code, ProMaterial, MOULD_CODE);
 
                     #endregion
@@ -1480,38 +1409,6 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                 #endregion
 
-                #region 底盘号间隔校验
-
-                //2016-10-31 闫永刚
-                int scanSum = dgvNF.Rows.Count;
-                int lastvinNumber = 0;
-                int vinNumber = 0;
-                if (scanSum > 0)
-                {
-                    lastvinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum - 1].Cells["REQUESTID"].Value.ToString());
-                    vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString());
-                }
-
-                if ((vinNumber - lastvinNumber) > 1)
-                {
-                    var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo);
-                    if (dresult == DialogResult.No)
-                    {
-                        ArragetxtCode();
-                        return;
-                    }
-                }
-
-                #endregion
-
-                #region 判断当前扫描过的数据集合中是否有相同条码
-                //判断当前扫描过的数据集合中是否有相同条码
-                if (outSourceProduct == "OP")
-                {
-                    CheckDataBase(Code);
-                }
-                #endregion 
-
                 #region 处理条码扫描文本框
                 ArragetxtCode();
                 #endregion 
@@ -1665,7 +1562,6 @@ namespace QMAPP.WinForm.Forms.TianJin
 
             if (tblbarcode.Rows.Count > 0)
             {
-
                 Alert("扫描条码重复，请重新扫描。");
             }
         }
@@ -1853,7 +1749,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             dgvNF.DataSource = nflist;
             strprodno = "";
             nfindex++;
-
+            
             //int setdefaultSum = Convert.ToInt32(QM.Config.CustomConfig.GetItem("ShowDataCount"));
             int setdefaultSum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount",""]);
             if (nfindex == setdefaultSum)
@@ -2156,15 +2052,8 @@ namespace QMAPP.WinForm.Forms.TianJin
             }
             for (int i = 0; i < tpContainer.ColumnCount; i++)
             {
-                //tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, tpContainer.ColumnCount > 8 ? 60 : 90));
                 tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50));
-
-                //Label lblno = new Label();
-                //lblno.Text = (i + 1).ToString();
-                //lblno.Font = new Font("微软雅黑", 20, FontStyle.Bold);
-                //lblno.Dock = DockStyle.Fill;
-                //lblno.TextAlign = ContentAlignment.MiddleCenter;
-                //tpContainer.Controls.Add(lblno, i, 0);
+                
                 for (int j = 0; j < tpContainer.RowCount; j++)
                 {
                     Label lblItem = new Label();
@@ -2175,7 +2064,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                     tpContainer.Controls.Add(lblItem, i, j);
                 }
             }
-            //tpContainer.Height = tpContainer.RowCount * (3 + (tpContainer.ColumnCount > 8 ? 60 : 90));
+            
             for (int i = 0; i < nfindex; i++)
             {
                 SetContainerItem(i, true);
@@ -2190,13 +2079,23 @@ namespace QMAPP.WinForm.Forms.TianJin
         /// <param name="result"></param>
         public void SetContainerItem(int itemindex, bool result)
         {
-            var columnindex = itemindex / (tpContainer.RowCount);
-            var rowindex = itemindex % (tpContainer.RowCount) ;
-            var label = tpContainer.GetControlFromPosition(columnindex, rowindex) as Label;
-            if (label != null)
+            if (itemindex == 1)
             {
+                var label = tpContainer.GetControlFromPosition(0, 0) as Label;
                 label.BackColor = result ? Color.Lime : Color.Red;
             }
+            else
+            {
+                itemindex = itemindex - 1;
+                var columnindex = itemindex / (tpContainer.RowCount);
+                var rowindex = itemindex % (tpContainer.RowCount);
+                var label = tpContainer.GetControlFromPosition(columnindex, rowindex) as Label;
+                if (label != null)
+                {
+                    label.BackColor = result ? Color.Lime : Color.Red;
+                }
+            }
+            
         }
 
         /// <summary>
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
index f5bbbb452dbd0de4ae12dae86da456bebf34ae0c..9ec0d1c63cfd5ad249b386dabe555ddb153da4e4 100644
GIT binary patch
delta 12490
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

delta 9548
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

diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
index cae55f2..e619dad 100644
--- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
+++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
@@ -2017,6 +2017,11 @@ namespace QMAPP.ServicesAgent
         /// </summary>
         [Description("贴车单记录明细查询")]
         TJFrmPlaceBLL_GetPasteDetails,
+        /// <summary>
+        ///   添加贴车单
+        /// </summary>
+        [Description("  添加贴车单")]
+        TJFrmPlaceBLL_AddPasteCard,
 
         #endregion
 
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index d10b552..d651a04 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -64,7 +64,10 @@
     <!--主数据库连接-->
 
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
+
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>-->