From c34c1816dfeb16028446de500edda9cca3926269 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <songnan.zhang@ccwin-in.com>
Date: Thu, 13 Jan 2022 09:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A9=E6=B4=A5=E9=97=A8?=
 =?UTF-8?q?=E6=9D=BF=E5=8F=91=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/QMAPP.Web/App_Data/Menu.xml               |   16 +
 APP/QMAPP.Web/Views/Home/Default.aspx         |    4 +-
 APP/QMAPP.Web/Views/Home/Login.aspx           |    4 +-
 APP/QMAPP.Web/Web.config                      |    5 +-
 APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj      |    3 +
 .../TianJin/TJDoorPlankPlanBLL.cs             | 1113 ++++++++
 APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs  |  599 ++++
 APPQ5/QMAPP.FJC.BLL/TianJin/TJOrderPlanBLL.cs | 1532 ++++++++++
 APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj      |    4 +
 .../TianJin/TJDoorPlankPlanDAL.cs             | 1017 +++++++
 APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs  | 1340 +++++++++
 APPQ5/QMAPP.FJC.DAL/TianJin/TJOrderPlanDAL.cs |  989 +++++++
 APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs | 1115 ++++++++
 .../QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj  |    6 +
 .../QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs  |  119 +
 .../TianJin/TJEPasteDetailsCard.cs            |  169 ++
 APPQ5/QMAPP.FJC.Entity/TianJin/TJFISORDER.cs  |   99 +
 APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlan.cs |  119 +
 .../TianJin/TJOrderPlanTrace.cs               |   82 +
 APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs |   98 +
 .../Controllers/ProductArchivesController.cs  |    2 +-
 .../Controllers/TJDoorPlankPlanController.cs  |  580 ++++
 .../Models/TianJin/TJDoorPlankPlanModel.cs    |  142 +
 APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj      |    4 +
 .../TJDoorPlankPlan/DoorPlankPlanEdit.aspx    |  106 +
 .../TJDoorPlankPlan/DoorPlankPlanList.aspx    |  191 ++
 APPQ5/QMAPP.FJC.Web/Web.config                |    5 +-
 APPQ5/QMAPP.WinForm/App.config                |   10 +-
 .../Forms/TianJin/RerportModel.ttx            |    9 +
 .../Forms/TianJin/TJDefaultDataSetNum.cs      |   60 +
 .../TianJin/TJDefaultDataSetNum.designer.cs   |  109 +
 .../Forms/TianJin/TJDefaultDataSetNum.resx    |  120 +
 .../Forms/TianJin/TJFrmCarCardDetail.cs       |   75 +
 .../TianJin/TJFrmCarCardDetail.designer.cs    |  281 ++
 .../Forms/TianJin/TJFrmCarCardDetail.resx     |  171 ++
 .../Forms/TianJin/TJFrmCarCardPrintShow.cs    |  170 ++
 .../TianJin/TJFrmCarCardPrintShow.designer.cs |  345 +++
 .../Forms/TianJin/TJFrmCarCardPrintShow.resx  |  219 ++
 .../Forms/TianJin/TJFrmItemList.cs            |  378 +++
 .../Forms/TianJin/TJFrmItemList.designer.cs   |  386 +++
 .../Forms/TianJin/TJFrmItemList.resx          |  156 ++
 .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 2489 +++++++++++++++++
 .../Forms/TianJin/TJFrmPlace.designer.cs      |  866 ++++++
 .../Forms/TianJin/TJFrmPlace.resx             |  192 ++
 .../QMAPP.WinForm/Forms/TianJin/TJPastCard.cs |  178 ++
 .../Forms/TianJin/TJPastCard.rpt              |  Bin 0 -> 753664 bytes
 .../Forms/TianJin/TJPastCardModel.cs          |   20 +
 .../Forms/TianJin/TJPrintPasteCard.cs         |  120 +
 .../Forms/TianJin/TJResetSendIndexForm.cs     |  175 ++
 .../TianJin/TJResetSendIndexForm.designer.cs  |  133 +
 .../Forms/TianJin/TJResetSendIndexForm.resx   |  120 +
 .../Forms/TianJin/TJfrmLineSetting.cs         |  132 +
 .../TianJin/TJfrmLineSetting.designer.cs      |  160 ++
 .../Forms/TianJin/TJfrmLineSetting.resx       |  120 +
 APPQ5/QMAPP.WinForm/LoginForm.Designer.cs     |    2 +-
 APPQ5/QMAPP.WinForm/MainForm.Designer.cs      |   14 +-
 APPQ5/QMAPP.WinForm/MainForm.cs               |   22 +-
 APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj      |   70 +
 AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs |   63 +
 .../App_Data/FJCServiceList.xml               |   15 +
 .../WCF/QMFrameWork.WebServiceHost/Web.config |    5 +-
 61 files changed, 16831 insertions(+), 17 deletions(-)
 create mode 100644 APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
 create mode 100644 APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
 create mode 100644 APPQ5/QMAPP.FJC.BLL/TianJin/TJOrderPlanBLL.cs
 create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs
 create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
 create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/TJOrderPlanDAL.cs
 create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJFISORDER.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlan.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlanTrace.cs
 create mode 100644 APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs
 create mode 100644 APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
 create mode 100644 APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
 create mode 100644 APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanEdit.aspx
 create mode 100644 APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCardModel.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.resx
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.designer.cs
 create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.resx

diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml
index ca16b43..692b69f 100644
--- a/APP/QMAPP.Web/App_Data/Menu.xml
+++ b/APP/QMAPP.Web/App_Data/Menu.xml
@@ -325,6 +325,22 @@
       <Action ContorllerName="OrderPlanTrace" ActionName="ExportExcel" PowerID="CD02050002">导出</Action>
     </Actions>
   </MenuItem>
+
+  <MenuItem MenuID="02060000" SystemID="FJC" MenuDes="TJ门板发运计划"   Action="/TJDoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02060001">查询</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02060002">添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="AddWholeDoor" PowerID="CD02060003">整车添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Edit" PowerID="CD02060004">修改</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="EditDoorPlankPlanSeq" PowerID="CD02060011">修改计划顺序号</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Insert" PowerID="CD02060005">插单</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Delete" PowerID="CD02060006">删除</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="PutOut" PowerID="CD02060007">发布</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ImportExcel" PowerID="CD02060008">导入</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02060009">导出</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02060010">下载模板</Action>
+    </Actions>
+  </MenuItem>
   
   <MenuItem MenuID="05000000" SystemID="Main" MenuDes="物料管理" Action="" PowerID="CD05000000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="" Seq="2">
     <Actions>
diff --git a/APP/QMAPP.Web/Views/Home/Default.aspx b/APP/QMAPP.Web/Views/Home/Default.aspx
index 68da83f..6bcae4a 100644
--- a/APP/QMAPP.Web/Views/Home/Default.aspx
+++ b/APP/QMAPP.Web/Views/Home/Default.aspx
@@ -2,7 +2,7 @@
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head id="Head1" runat="server">
-    <title>富维安道拓成都数字化工厂</title>
+    <title>富维安道拓数字化工厂</title>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <link rel="stylesheet" href="../../Content/Site.css" />    
@@ -104,7 +104,7 @@
                                 <img width="145px" height="51px" alt="" src="../../Content/default/cfaa.png" 
                                     style="margin: 2px 20px 2px 30px; " /> </td>
                             <td align=left nowrap=nowrap>
-                                <span style="font-weight: bold; font-size: 24pt; font-family: 宋体; color: #16537a;">富维安道拓成都数字化工厂</span>                                                     
+                                <span style="font-weight: bold; font-size: 24pt; font-family: 宋体; color: #16537a;">富维安道拓数字化工厂</span>                                                     
                             </td>
                         </tr>
                     </table>
diff --git a/APP/QMAPP.Web/Views/Home/Login.aspx b/APP/QMAPP.Web/Views/Home/Login.aspx
index a2c0eee..4276fcb 100644
--- a/APP/QMAPP.Web/Views/Home/Login.aspx
+++ b/APP/QMAPP.Web/Views/Home/Login.aspx
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>富维安道拓成都数字化工厂</title>
+    <title>富维安道拓数字化工厂</title>
     <%--    <noscript>
         &lt;meta http-equiv="Refresh" content="0;登录到 系统需要启用 JavaScript。当前 Web 浏览器不支持 JavaScript
         或阻止了脚本。&lt;br /&gt;&lt;br /&gt;若要查看你的浏览器是否支持 JavaScript 或允许使用脚本，请查看浏览器联机帮助。
@@ -157,7 +157,7 @@
             style="position: absolute; z-index: auto; top: 20px; left: 30px;" 
             width="294" />--%>
         <h1>
-            富维安道拓成都数字化工厂</h1>
+            富维安道拓数字化工厂</h1>
         <h2>
             Adient CHENGDU Digital factory</h2>
         <div id="printDiv" style="display: none;">
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index e8cc96b..0357f34 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -40,7 +40,10 @@
     <!--主数据库连接-->
     <!--<add name="maindb" connectionString="Data Source=USER-20180104HU;Initial Catalog=CD_MES;User Id=sa;Password=qm;" providerName="System.Data.SqlClient"/>-->
 
-    <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.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+
+
+    <!--<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=CD_TEST;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
 	</connectionStrings>
diff --git a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
index 90cfe81..e993bd7 100644
--- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
+++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
@@ -185,6 +185,9 @@
     <Compile Include="QT\MaterialBindingBLL.cs" />
     <Compile Include="SendManage\SendPlanRecordBLL.cs" />
     <Compile Include="Stocktaking\StocktakingBLL.cs" />
+    <Compile Include="TianJin\TJDoorPlankPlanBLL.cs" />
+    <Compile Include="TianJin\TJFrmPlaceBLL.cs" />
+    <Compile Include="TianJin\TJOrderPlanBLL.cs" />
     <Compile Include="WarehouseManage\OutWarehouseBLL.cs" />
     <Compile Include="ProduceManage\MendRecorderBLL.cs" />
     <Compile Include="WarehouseManage\InWarehouseBLL.cs" />
diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
new file mode 100644
index 0000000..4760d1d
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
@@ -0,0 +1,1113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.BLL;
+using QMAPP.FJC.Entity.FIS;
+using QMAPP.Entity;
+using QMFrameWork.Log;
+using QMAPP.FJC.Entity;
+using QMFrameWork.Data;
+using QMAPP.FJC.DAL.FIS;
+using System.Data;
+using QMAPP.FJC.BLL.Dict;
+using QMAPP.MD.Entity;
+using QMAPP.MD.DAL;
+using QMAPP.FJC.DAL.ProductionPlan;
+using QMAPP.FJC.Entity.ProductionPlan;
+using QMFrameWork.Common.Util;
+using QMAPP.FJC.Entity.FileCopy.FIS;
+using QMAPP.FJC.Entity.TianJin;
+using QMAPP.FJC.DAL.TianJin;
+
+namespace QMAPP.FJC.BLL.TianJin
+{
+    public class TJDoorPlankPlanBLL : BaseBLL
+    {
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public DataResult<TJOrderPlan> Get(TJOrderPlan model)
+        {
+            DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+            try
+            {
+                result.Result = new TJDoorPlankPlanDAL().Get(model);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "订单计划信息逻辑层-获取信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        /// <summary>
+        /// 获取FIS插单的位置
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public DataResult<TJOrderPlan> GetFISInsertPos(TJOrderPlan model)
+        {
+            DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+            try
+            {
+                var dal= new TJDoorPlankPlanDAL();
+                //var position =dal.Get(model);
+
+                //if (position == null)
+                //{
+                //    throw new Exception("获取FIS插单位置信息失败！");
+                //}
+                //if(!string.Equals(position.PLANSOURCE,EnumGeter.WORKORDERTYPE.FIS.GetHashCode().ToString()))
+                //{
+                //    result.Msg = "只能选择FIS计划作为插单位置！";
+                //    result.IsSuccess = false;
+                //    return result;
+                //}
+
+                result.Result = null;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "订单计划信息逻辑层-获取信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataResult<DataPage> GetList(TJOrderPlan condition, DataPage page)
+        {
+            DataResult<DataPage> result = new DataResult<DataPage>();
+            try
+            {
+                //获取订单计划信息列表
+                DataPage dataPage = new TJDoorPlankPlanDAL().GetList(condition, page);
+                //DataPage dataPage = new DataPage();
+
+                List<TJOrderPlan> list = page.Result as List<TJOrderPlan>;
+                #region 显示类型
+                //处理字典信息
+                DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+                foreach (var info in list)
+                {
+                    info.PLAN_STATE = dictPLANSTATE.GetDictValue(info.PLAN_STATE);
+                }
+                #endregion
+                result.Result = dataPage;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-获取列表！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 信息是否重复
+        /// <summary>
+        /// 判断名称是否存在
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns>true:已存在；fasel:不存在。</returns>
+        public int ExistsOrderPlan(TJOrderPlan model)
+        {
+            try
+            {
+                return new TJDoorPlankPlanDAL().ExistsOrderPlan(model);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        public DataResult<int> Insert(TJOrderPlan model)
+        {
+            DataResult<int> result = new DataResult<int>();
+            //基本信息
+            model.PID = Guid.NewGuid().ToString();
+            model.PLAN_STATE = "0";
+            model.CREATEUSER = this.LoginUser.UserID;
+            model.CREATEDATE = DateTime.Now;
+            model.UPDATEUSER = model.CREATEUSER;
+            model.UPDATEDATE = model.CREATEDATE;
+            
+            TJDoorPlankPlanDAL cmdDAL = new TJDoorPlankPlanDAL();
+
+            model.MATERIAL_NAME = cmdDAL.GetMATERIALNAME(model.MATERIAL_CODE);
+
+            try
+            {
+                //获取流水号
+                var SEQSTR = this.GetOrderPlanSeq(model);
+                model.PLAN_SEQ = SEQSTR;
+                //计划单号
+                model.PLAN_NO = "DP" + model.PLAN_DATE.ToString("yyyyMMdd") + SEQSTR;
+                result.Result = new TJDoorPlankPlanDAL().Insert(model);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-插入信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 获取流水号信息
+        /// <summary>
+        /// 获取流水号信息
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <returns></returns>
+        public string GetOrderPlanSeq(TJOrderPlan condition)
+        {
+            TJOrderPlan fisplan = new TJOrderPlan();
+            TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+            //根据表皮条码获取本体信息
+
+            try
+            {
+                fisplan = new TJOrderPlanDAL().GetOrderPlanSeq(condition);
+
+                //若存在记录，流水号加1，且更新
+                if (fisplan != null)
+                {
+                    return (Convert.ToInt32(fisplan.PLAN_SEQ) + 1).ToString().PadLeft(3, '0');
+                    
+                }
+                //不存在则插入此日期信息
+                else
+                {
+                    return "001";
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "仪表板逻辑层-获取流水号本体信息！"
+                });
+                throw ex;
+            }
+        }
+        #endregion 
+
+        #region 更新信息
+        /// <summary>
+        /// 更新信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        public DataResult<int> Update(TJOrderPlan model)
+        {
+            DataResult<int> result = new DataResult<int>();
+            model.UPDATEUSER = this.LoginUser.UserID;
+            try
+            {
+                if (model.PLAN_STATE != "0")
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "计划已经下发，无法修改！";
+                    return result;
+                }
+
+                #region 判断数量
+
+                TJDoorPlankPlanDAL cmdDAL = new TJDoorPlankPlanDAL();
+                model.MATERIAL_NAME = cmdDAL.GetMATERIALNAME(model.MATERIAL_CODE);
+
+                //获取流水号
+                var SEQSTR = this.GetOrderPlanSeq(model);
+                model.PLAN_SEQ = SEQSTR;
+                //计划单号
+                model.PLAN_NO = "DP" + model.PLAN_DATE.ToString("yyyyMMdd") + SEQSTR;
+
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+                
+                #endregion
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    TJOrderPlanDAL.Update(model);
+                }
+
+                result.IsSuccess = true;
+                result.Msg = "修改成功!";
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-更新信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+            }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>删除个数</returns>
+        public DataResult<int> Delete(string strs)
+        {
+            int count = 0;
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+
+                TJWorkOrderDAL TJworkOrderDal = new TJWorkOrderDAL();
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+                
+                //可以删除的订单
+                List<TJOrderPlan> deleteOrderList = new List<TJOrderPlan>();
+                
+                TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = strs });
+                int Num = TJworkOrderDal.GetAllWorkOrder(strs);
+                if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString()
+                    || (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && Num == 0))
+                {
+                    //删除订单
+                    TJOrderPlanDAL.DeleteOrderPlan(op);
+                    TJworkOrderDal.BatchDeleteByOrderPlan(new TJWorkOrder() { ORDERPLANID = op.PID });
+                }
+                else
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "只有初始化或是确认生产并且生产数量为0订单可以删除!";
+                    return result;
+                }
+                
+                result.Result = count;
+                result.Msg = "订单删除成功!";
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>删除个数</returns>
+        public int DeleteDoorPlankPlan(TJOrderPlan model)
+        {
+            int count = 0;
+            int number = new TJDoorPlankPlanDAL().DelCheck(model);
+            if (number > 0)
+            {
+                return count;
+            }
+            count = new TJDoorPlankPlanDAL().Delete(model);
+            return count;
+        }
+        #endregion
+
+        #region 发布
+        /// <summary>
+        /// 发布信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>发布个数</returns>
+        public DataResult<int> PutOut(string strs)
+        {
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+                List<TJOrderPlan> validorderPlanList = new List<TJOrderPlan>();
+                
+                TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan { PID = strs });
+
+                if (op.PLAN_STATE != EnumGeter.PLANSTATE.INIT.GetHashCode().ToString())
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "只有初始状态下的订单能够进行发布!";
+
+                    return result;
+                }
+                
+                DataTable totalDt = GetWorkOrderTable();
+                op.PLAN_STATE = EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString();
+                op.UPDATEUSER = this.LoginUser.UserID;
+
+                totalDt = this.PutOutOrderPlan(op, totalDt);
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+                    if (dbConn.State == ConnectionState.Closed)
+                    {
+                        dbConn.Open();
+                    }
+                    IDbTransaction ids = dbConn.BeginTransaction();
+                    
+                    TJOrderPlanDAL.Update(op);
+
+                    session.DbHelper.BulkCopyData(totalDt, "T_PP_TJFY_WORKORDER", dbConn, ids);
+                    ids.Commit();
+                }
+
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 发布信息
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>发布个数</returns>
+        public DataTable PutOutOrderPlan(TJOrderPlan info, DataTable workOrderDt)
+        {
+            WorkCellDAL workCelldal = new WorkCellDAL();
+            var list = "LF,LR,RF,RR".Split(',');
+            //注入派工单信息
+            for (int i = 0; i < info.QTY; i++)
+            {
+                foreach (var seq in list)
+                {
+                    DataRow workOrder = workOrderDt.NewRow();
+
+                    workOrder["PID"] = Guid.NewGuid().ToString();
+                    workOrder["ORDERPLANID"] = info.PID;
+                    workOrder["ORDERPLAN_NO"] = (info.PLAN_NO.ToString()+ (i + 1).ToString().PadLeft(4, '0'));
+                    workOrder["SEQ"] = info.PLAN_NO.Substring(info.PLAN_NO.Length-2,2)+(i + 1).ToString().PadLeft(4, '0');
+                    workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE;
+                    workOrder["MATERIAL_NAME"] = info.MATERIAL_NAME;
+                    workOrder["PLAN_DATE"] = info.PLAN_DATE;
+                    workOrder["PRODUCTCODE"] = "";
+                    workOrder["MOULD_CODE"] = seq;
+                    workOrder["LINENO"] = info.LINENO;
+                    workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString();
+                    workOrder["UPDATEDATE"] = DateTime.Now.ToString();
+
+                    workOrderDt.Rows.Add(workOrder);
+                }
+            }
+
+            return workOrderDt;
+        }
+
+        //public List<WorkOrder> PutOutOrderPlan(TJOrderPlan info, int number, int lastIndex)
+        //{
+        //    List<WorkOrder> wolist = new List<WorkOrder>();
+        //    WorkCellDAL workCelldal = new WorkCellDAL();
+        //    string pbomcode = info.PBOM_CODE;
+        //    List<QMAPP.MD.Entity.ProcessRouteWorkCellSeq> list = workCelldal.GetFirstWorkCell(pbomcode);
+        //    var dicPRI = new DictManageBLL(Dict.DictKind.ORDERPRI);
+
+        //    //注入派工单信息
+        //    for (int i = 0; i < number; i++)
+        //    {
+        //        foreach (var seq in list)
+        //        {
+        //            WorkOrder wo = new WorkOrder();
+        //            wo.PID = Guid.NewGuid().ToString();
+        //            wo.ORDERPLANID = info.PID;
+        //            wo.ORDERPLAN_NO = (info.PLAN_NO.ToString() + (i + 1 + lastIndex).ToString().PadLeft(4, '0'));
+        //            wo.ORDER_TYPE = info.PLANSOURCE;
+        //            wo.SEQ = (i + 1 + lastIndex).ToString().PadLeft(6, '0');
+        //            wo.MATERIAL_CODE = info.MATERIAL_CODE;
+        //            wo.PBOM_CODE = info.PBOM_CODE;
+        //            wo.QTY = 1;
+        //            wo.COMPLETE_QTY = 0;
+        //            wo.PLAN_DATE = info.PLAN_DATE;
+        //            wo.SHIFT_CODE = info.SHIFT_CODE;
+        //            wo.WORKCENTER_CODE = info.WORKCENTER_CODE;
+        //            wo.WORKCELL_CODE = seq.WORKCELL_CODE;
+        //            wo.WORKLOC_CODE = "";
+        //            wo.REMARK = "";
+        //            wo.EQPT_NAME = "";
+        //            wo.EQPT_CODE = "";
+        //            wo.STATE = Convert.ToInt32(EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString());
+        //            wo.PRI = Convert.ToInt32(dicPRI.GetDictValue(info.PLANSOURCE));
+        //            wo.PRINTED = "0";
+        //            wolist.Add(wo);
+        //        }
+
+        //    }
+
+        //    return wolist;
+        //}
+
+        #endregion
+
+        #region 导出数据
+        /// <summary>
+        /// 获取导出的数据
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <returns>数据</returns>
+        public DataTable GetExportData(TJOrderPlan model)
+        {
+            try
+            {
+                //DataTable dt = new TJDoorPlankPlanDAL().GetExportData(model);
+                DataTable dt = new DataTable();
+
+                DictManageBLL dictPRODUCEREQUIRE = new DictManageBLL(DictKind.PRODUCEREQUIRE);
+                DictManageBLL dictPLANSOURCE = new DictManageBLL(DictKind.PLANSOURCE);
+                DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //替换状态类别显示值
+                    dr["PRODUCEREQUIRE"] = dictPRODUCEREQUIRE.GetDictValue(dr["PRODUCEREQUIRE"].ToString());
+                    //info.PLANSOURCE = dictPLANSOURCE.GetDictValue(info.PLANSOURCE);
+                    dr["PLANSOURCE"] = dictPLANSOURCE.GetDictValue(dr["PLANSOURCE"].ToString());
+                    dr["PLAN_STATE"] = dictPLANSTATE.GetDictValue(dr["PLAN_STATE"].ToString());
+                }
+                
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 导入数据
+        /// <summary>
+        /// 导入Excel表数据
+        /// </summary>
+        /// <param name="list">Excel列表</param>
+        /// <param name="aramodel">区域信息</param>
+        /// <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;
+        //    }
+        //}
+        
+        #endregion
+
+        #region 获取产品表
+        /// <summary>
+        /// 获取产品表
+        /// </summary>
+        /// <returns></returns>
+        private DataTable GetOrderPlanTable()
+        {
+            DataTable dt = new DataTable();
+
+            dt.Columns.Add(new DataColumn() { ColumnName = "PID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "FACTORY_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_NO", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_SEQ", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_STATE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MATERIAL_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PBOM_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ROUTE_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "REMARK", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "COMPLETE_QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_DATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "SHIFT_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLANSOURCE", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PRODUCEREQUIRE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "CREATEDATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "CREATEUSER", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "UPDATEDATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "UPDATEUSER", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCENTER_CODE", DataType = typeof(string) });
+
+            return dt;
+        }
+
+        private DataTable GetWorkOrderTable()
+        {
+            DataTable dt = new DataTable();
+
+            dt.Columns.Add(new DataColumn() { ColumnName = "PID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ORDERPLANID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ORDERPLAN_NO", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "SEQ", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MATERIAL_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MATERIAL_NAME", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_DATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PRODUCTCODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "STATE", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MOULD_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "LINENO", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "UPDATEDATE", DataType = typeof(string) });
+            return dt;
+        }
+        #endregion
+
+        #region 整车插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        //public DataResult<int> InsertWholeDoor(TJOrderPlan model, List<Material> materiallist)
+        //{
+        //    List<TJOrderPlan> List = new List<TJOrderPlan>();
+        //    DataResult<int> result = new DataResult<int>();
+        //    TJDoorPlankPlanDAL cmdDAL = new TJDoorPlankPlanDAL();
+        //    cmdDAL.BaseSession = AppDataFactory.CreateMainSession();
+        //    string plan_Seq = "";
+        //    foreach (Material ma in materiallist)
+        //    {
+        //        TJOrderPlan planmodel = new TJOrderPlan();
+        //        planmodel.MATERIAL_CODE = ma.MATERIAL_CODE;
+        //        planmodel.PID = Guid.NewGuid().ToString();
+
+        //        planmodel.QTY = model.QTY;
+        //        planmodel.PLAN_DATE = model.PLAN_DATE;
+        //        planmodel.SHIFT_CODE = model.SHIFT_CODE;
+        //        planmodel.PRODUCEREQUIRE = "0";
+
+
+        //        planmodel.PLANSOURCE = model.PLANSOURCE;
+        //        planmodel.PLAN_STATE = "0";
+        //        //计划来源
+        //        planmodel.PLANSOURCE = model.PLANSOURCE;
+              
+        //        //顺序号
+        //        OrderPlanSerial serial = new TJDoorPlankPlanDAL().GetNumSerial(model);
+              
+        //        if (serial != null)
+        //        {
+                   
+        //            //流水号加1，补位
+        //            planmodel.PLAN_SEQ = (serial.SERIAL_NO + 1).ToString().PadLeft(3, '0');
+        //            //更新流水号
+        //            serial.SERIAL_NO = serial.SERIAL_NO + 1;
+
+        //            if (string.IsNullOrEmpty(plan_Seq))
+        //            {
+        //                plan_Seq = planmodel.PLAN_SEQ;
+        //            }
+
+        //            int no = new TJDoorPlankPlanDAL().UpdateSerial(serial);
+        //        }
+        //        else
+        //        {
+        //            OrderPlanSerial serialinfo = new OrderPlanSerial();
+        //            //若为空则插入流水号表信息
+        //            serialinfo.PID = Guid.NewGuid().ToString();
+        //            serialinfo.SERIAL_NO = 1;
+        //            serialinfo.SERIAL_TYPE = model.ORDER_TYPE;
+        //            serialinfo.SERIAL_DATE = model.PLAN_DATE.ToString("yyyyMMdd");
+        //            int num = new TJDoorPlankPlanDAL().InsertSerial(serialinfo);
+        //            //流水号补位
+        //            planmodel.PLAN_SEQ = (serialinfo.SERIAL_NO).ToString().PadLeft(3, '0');
+
+        //            if (string.IsNullOrEmpty(plan_Seq))
+        //            {
+        //                plan_Seq = planmodel.PLAN_SEQ;
+        //            }
+        //        }
+
+        //        string matype = ma.MATERIAL_TYPE_CODE;
+        //        string a = matype.Substring(matype.Length - 2, 1);
+        //        string b = matype.Substring(matype.Length - 1, 1);
+        //        string planSet = b + a;
+        //        //计划单号
+        //        planmodel.PLAN_NO = model.AsmSetCode+planSet + model.PLAN_DATE.ToString("yyMMdd") + planmodel.PLAN_SEQ + "SD";
+
+        //        Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = planmodel.MATERIAL_CODE });
+        //        planmodel.PBOM_CODE = pbomcode.PBOM_CODE;
+        //        string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE);
+        //        planmodel.WORKCENTER_CODE = workcentercode;
+        //        if (planmodel.WORKCENTER_CODE != "")
+        //        {
+        //            string factory = new FactoryDAL().GetFactoryWithWorkcenter(planmodel.WORKCENTER_CODE);
+        //            planmodel.FACTORY_CODE = factory;
+        //        }
+        //        QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(planmodel.MATERIAL_CODE);
+        //        //QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE);
+        //        planmodel.ROUTE_CODE = routecode != null ? routecode.ROUTE_CODE : "";
+        //        planmodel.CREATEUSER = this.LoginUser.UserID;
+        //        planmodel.CREATEDATE = DateTime.Now;
+        //        planmodel.UPDATEUSER = planmodel.CREATEUSER;
+        //        planmodel.UPDATEDATE = planmodel.CREATEDATE;
+
+        //        planmodel.PLAN_SEQ = plan_Seq;
+
+        //        List.Add(planmodel);
+        //    }
+            
+
+        //    try
+        //    {
+        //        if (ExistsOrderPlan(model) > 0)
+        //        {
+        //            result.IsSuccess = false;
+        //            result.Msg = Resource.MaterielCodeIsHave;
+        //            return result;
+        //        }
+        //        result.Result = cmdDAL.InsertDoorPlan(List);
+
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "信息逻辑层-插入信息！"
+        //        });
+        //        result.IsSuccess = false;
+        //        result.Msg = Resource.SystemException;
+        //        throw ex;
+        //    }
+        //    result.IsSuccess = true;
+        //    return result;
+        //}
+        
+        #endregion
+
+        #region 保存FIS插单
+        /// <summary>
+        /// 保存FIS插单
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        //public DataResult<int> SaveFISInsert(TJOrderPlan model, List<Material> materiallist,bool Publish)
+        //{
+        //    List<TJOrderPlan> List = new List<TJOrderPlan>();
+        //    DataResult<int> result = new DataResult<int>();
+        //    TJDoorPlankPlanDAL cmdDAL = new TJDoorPlankPlanDAL();
+        //    cmdDAL.BaseSession = AppDataFactory.CreateMainSession();
+        //    var InsertNum = cmdDAL.GetMaxFISInsertNum(model) + 1;
+        //    foreach (Material ma in materiallist)
+        //    {
+        //        TJOrderPlan planmodel = new TJOrderPlan();
+        //        planmodel.MATERIAL_CODE = ma.MATERIAL_CODE;
+        //        planmodel.PID = Guid.NewGuid().ToString();
+
+        //        planmodel.QTY = model.QTY;
+        //        planmodel.PLAN_DATE = model.PLAN_DATE;
+        //        //planmodel.SHIFT_CODE = model.SHIFT_CODE;
+        //        planmodel.PRODUCEREQUIRE = "0";
+
+        //        planmodel.PLAN_STATE = "0";
+        //        //计划来源
+        //        planmodel.PLANSOURCE = model.PLANSOURCE;
+        //        //顺序号
+        //        planmodel.PLAN_SEQ = string.Format("{0}-{1:D1}", model.PLAN_SEQ, InsertNum);
+        //        var seqstr = model.PLAN_SEQ;
+        //        if (seqstr.Length < 4)
+        //        {
+        //            seqstr = seqstr.PadLeft(4, '0');
+        //        }
+        //        else if (seqstr.Length > 4)
+        //        {
+        //            seqstr = seqstr.Substring(seqstr.Length - 4);
+        //        }
+        //        string matype = ma.MATERIAL_TYPE_CODE;
+
+        //        //计划单号
+        //        planmodel.PLAN_NO = string.Format("DPINS{0:yyyyMMdd}{1}{2}{3:D1}",
+        //            model.PLAN_DATE,
+        //            matype.Substring(matype.Length - 2, 2),
+        //            seqstr,
+        //            InsertNum);
+
+        //        Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = planmodel.MATERIAL_CODE });
+        //        planmodel.PBOM_CODE = pbomcode.PBOM_CODE;
+        //        string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE);
+        //        planmodel.WORKCENTER_CODE = workcentercode;
+        //        if (planmodel.WORKCENTER_CODE != "")
+        //        {
+        //            string factory = new FactoryDAL().GetFactoryWithWorkcenter(planmodel.WORKCENTER_CODE);
+        //            planmodel.FACTORY_CODE = factory;
+        //        }
+        //        planmodel.CREATEUSER = this.LoginUser.UserID;
+        //        planmodel.CREATEDATE = DateTime.Now;
+        //        planmodel.UPDATEUSER = planmodel.CREATEUSER;
+        //        planmodel.UPDATEDATE = planmodel.CREATEDATE;
+
+        //        List.Add(planmodel);
+        //    }
+
+
+        //    try
+        //    {
+        //        if (ExistsOrderPlan(model) > 0)
+        //        {
+        //            result.IsSuccess = false;
+        //            result.Msg = Resource.MaterielCodeIsHave;
+        //            return result;
+        //        }
+        //        result.Result = cmdDAL.InsertDoorPlan(List);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "信息逻辑层-插入信息！"
+        //        });
+        //        result.IsSuccess = false;
+        //        result.Msg = Resource.SystemException;
+        //        throw ex;
+        //    }
+        //    result.IsSuccess = true;
+        //    return result;
+        //}
+        #endregion
+
+        #region 获取列表（为了修改顺序号使用）
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataResult<DataPage> GetDoorPlankPlanList(TJOrderPlan condition, DataPage page)
+        {
+            DataResult<DataPage> result = new DataResult<DataPage>();
+            try
+            {
+                //获取信息列表
+                DataPage dataPage = new TJDoorPlankPlanDAL().GetDoorPlankPlanList(condition, page);
+
+                result.Result = dataPage;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-获取列表！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 更新顺序号信息
+        /// <summary>
+        /// 更新顺序号信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新个数</returns>
+        public DataResult<int> UpdateDoorPlankPlanSeq(TJOrderPlan TJOrderPlan)
+        {
+            int count = 0;
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                //foreach (string str in list)
+                //{
+                //    TJOrderPlan op = new TJOrderPlan();
+                //    op.PID = str;
+                //    op.PLAN_SEQ = TJOrderPlan.PLAN_SEQ;
+                //    result.Result += this.UpdateSeq(op);
+                //}
+
+                result.Result = count;
+                result.Msg = "更新成功!";
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 更新顺序号信息
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>删除个数</returns>
+        public int UpdateSeq(TJOrderPlan model)
+        {
+            int count = 0;
+            count = new TJDoorPlankPlanDAL().UpdateSeq(model);
+            return count;
+        }
+        #endregion
+
+        #region 门板计划物料号CD
+        /// <summary>
+        /// 门板计划物料号CD
+        /// </summary>
+        /// <param name="OrderType"></param>
+        /// <returns></returns>
+        public List<FISAssembly> GetMaterialDoorPlanForCD(FISAssembly info)
+        {
+            List<FISAssembly> result = new List<FISAssembly>();
+            try
+            {
+                result = new TJDoorPlankPlanDAL().GetMaterialDoorPlanForCD(info);
+                //转换高低配和颜色
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return result;
+        }
+        #endregion 
+
+        #region 获取本体信息
+        /// <summary>
+        /// 获取本体信息
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <returns></returns>
+        public FISAssembly GetFISMaterialInfoCD(string IdInfo)
+        {
+            FISAssembly Fisassmble = new FISAssembly();
+            //根据表皮条码获取本体信息
+            Fisassmble.Id = IdInfo;
+            try
+            {
+                List<FISAssembly> FisassmbleList = new TJDoorPlankPlanDAL().GetMaterialDoorPlanForCD(Fisassmble);
+                foreach (FISAssembly m in FisassmbleList)
+                {
+                    Fisassmble.MESModulFL = m.MESModulFL;
+                    Fisassmble.MESModulFR = m.MESModulFR;
+                    Fisassmble.MESModulRL = m.MESModulRL;
+                    Fisassmble.MESModulRR = m.MESModulRR;
+                    Fisassmble.AsmSetCode = m.AsmSetCode;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "产品档案逻辑层-获取本体信息！"
+                });
+                throw ex;
+            }
+            return Fisassmble;
+        }
+        #endregion
+
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
new file mode 100644
index 0000000..2073f52
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs
@@ -0,0 +1,599 @@
+using System;
+using System.Collections.Generic;
+using QMAPP.BLL;
+using QMAPP.Entity;
+using QMAPP.FJC.BLL.Dict;
+using QMAPP.FJC.DAL.ProduceManage;
+using QMAPP.FJC.Entity.ProduceManage;
+using QMFrameWork.Data;
+using QMFrameWork.Log;
+using QMAPP.FJC.Entity;
+using System.Data;
+using Model;
+using QMAPP.FJC.DAL.Operation;
+using QMAPP.FJC.Entity.Operation;
+//using QMAPP.FJC.Entity.Operation;
+//using QMAPP.FJC.DAL.Operation;
+
+namespace QMAPP.FJC.BLL.TianJin
+{
+    /// <summary>
+    ///　模块编号：M4-1
+    ///　作    用：发运模块
+    ///　作    者：崔法宝
+    ///　编写日期：2017年09月05日
+    ///</summary>   
+    public class TJFrmPlaceBLL : BaseBLL
+    {
+
+        #region 获取列表
+        /// <summary>
+        /// 获得Fis发货队列信息
+        /// </summary>
+        /// <param name="pMaterial"></param>
+        /// <returns></returns>
+        public DataTable GetList(string pFisType,string WORKCENTER_CODE)
+        {
+            #region
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetList(pFisType, WORKCENTER_CODE);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+        #endregion
+
+        #region 天津发运--计划挂起  state=4
+
+        public int UpdateWorkOrderState(List<string> Ids)
+        {
+            try
+            {
+                var count = 0;
+                if (Ids.Count > 0)
+                {
+                    return new FJC.DAL.TianJin.TJFrmPlaceDAL().UpdateWorkOrderState(Ids);
+                }
+                return count;
+            }
+            catch
+            {
+                return 0;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 贴车单记录查询
+        /// </summary>
+        /// <param name="ppastercardno"></param>
+        /// <param name="strbegindate"></param>
+        /// <param name="strenddate"></param>
+        /// <param name="vinLack"></param>
+        /// <returns></returns>
+        public DataTable GetPastecardInfoWithVin(string ppastercardno, string strbegindate, string strenddate, string vinLack, string PlantCode, string Operator)
+        {
+            #region
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPastecardInfoWithVin(ppastercardno, strbegindate, strenddate, vinLack, PlantCode, Operator);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 根据贴车单主键查询贴车单明细
+        /// </summary>
+        /// <param name="ppastercarKey"></param>
+        /// <returns></returns>
+        public DataTable GetPasteDetails(string ppastercarKey)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPasteDetails(ppastercarKey);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// 实现校准功能
+        /// </summary>
+        /// <param name="strvwseq"></param>
+        public void UpdateFisOrder(string strvwseq, string strCP5A,string workcenter)
+        {
+            try
+            {
+                new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().UpdateFisOrder(strvwseq, strCP5A, workcenter);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+         /// <summary>
+        /// 获取贴车单当天的总条数
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetPastecardNo(string strcreatetime)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPastecardNo(strcreatetime);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+         /// <summary>
+        /// 获取发车信息
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetPastecardIndex(string PLANTNAME, string PASTECARDNO)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPastecardIndex(PLANTNAME, PASTECARDNO);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 添加贴车单
+        /// </summary>
+        /// <param name="ppastecard"></param>
+        /// <returns></returns>
+        public int AddPasteCard(EPasteCard ppastecard)
+        {
+            
+
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().AddPasteCard(ppastecard);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+         /// <summary>
+        /// 更新贴车单信息
+        /// </summary>
+        /// <param name="UpdatePastecardIndex"></param>
+        /// <param name="dt"></param>
+        public int UpdatePastecardIndex(string UpdatePastecardIndex,string Plantname)
+        {
+            try
+            {
+
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().UpdatePastecardIndex(UpdatePastecardIndex, System.DateTime.Now, Plantname);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 更新补打时间
+        /// </summary>
+        /// <param name="PASTECARDNO"></param>
+        /// <param name="PasteCarddate2"></param>
+        /// <param name="OPERATOR"></param>
+        /// <returns></returns>
+        public int UpdatePasteCardPasteCardDate2Value(string PASTECARDNO, string PasteCarddate2, string OPERATOR)
+        {
+
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().UpdatePasteCardPasteCardDate2Value(PASTECARDNO, PasteCarddate2, OPERATOR);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        
+        /// <summary>
+        /// 获取下护板扫描表其他条码号
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetOhterCode(string code)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetOhterCode(code);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+          /// <summary>
+        /// 获取配置表中的规则类型值
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetRule(string cartype, string nf)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetRule(cartype, nf);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+           /// <summary>
+        /// 根据条码标识查询零件信息
+        /// </summary>
+        /// <param name="strbarcode"></param>
+        /// <returns></returns>
+        public DataTable GetSparepartsinfo(string strbarcode)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetSparepartsinfo(strbarcode);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+           /// <summary>
+        /// 判断条码是否重复
+        /// </summary>
+        /// <param name="barcodetime"></param>
+        /// <returns></returns>
+        public DataTable ExistBarcode(int barcodetime, string pbarcode)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().ExistBarcode(barcodetime, pbarcode);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+          /// <summary>
+        /// 打印条码
+        /// </summary>
+        /// <param name="barcodetime"></param>
+        /// <returns></returns>
+        public DataTable WriteFile(string sql)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().WriteFile(sql);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+          /// <summary>
+        /// 更新贴车单补打印时间
+        /// </summary>
+        /// <param name="pastecardno"></param>
+        public void UpdataBarcodeDate(string pastecardno)
+        {
+            try
+            {
+                new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().UpdataBarcodeDate(pastecardno);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+        public void InsertLog(EFailLog plog)
+        {
+            try
+            {
+                new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().InsertLog(plog);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+
+        
+        /// <summary>
+        ///  获取扫取条形码是否存在
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public int GetExitsCode(string code)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetExitsCode(code);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+
+         /// <summary>
+        /// 查询是否为成品
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public object GetExitsStatus(string code)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetExitsStatus(code);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+         /// <summary>
+        /// 添加贴车单
+        /// </summary>
+        /// <param name="ppastecard"></param>
+        /// <param name="pDetailsCard"></param>
+        /// <returns></returns>
+        public int AddNewPasteCard(EPasteCard ppastecard,int Count)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().AddNewPasteCard(ppastecard,Count);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+          /// <summary>
+        /// 获取工作中心
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetWORKCENTERCODE()
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetWORKCENTERCODE();
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+
+        }
+
+
+           /// <summary>
+        /// 获取 DASPASTECARDINDEX表数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetDaspssteCarIndexByPlanName(string PlanTName)
+        {
+
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetDaspssteCarIndexByPlanName(PlanTName);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+               /// <summary>
+        /// 插入 DASPASTECARDINDEX表数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public int InsertDaspssteCarIndexByPlanName(EPasteCard ppastecard)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().InsertDaspssteCarIndexByPlanName(ppastecard);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+        /// <summary>
+        /// GetPastecardDeatis
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetPastecardDeatis()
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPastecardDeatis();
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+           /// <summary>
+        /// 根据贴车单ID获取详细
+        /// </summary>
+        /// <param name="ppastercarKey"></param>
+        /// <returns></returns>
+        public DataTable GetPascardDetailsByPid(string ppastercarKey)
+        {
+            try
+            {
+                return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().GetPascardDetailsByPid(ppastercarKey);
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+
+        //public Product GetProductForSend(string code)
+        //{
+        //    try
+        //    {
+        //        return new ProductDAL().GetProductInfo(new Product() { PRODUCTCODE = code });
+        //        //return new Product();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+
+        //}
+    /// <summary>
+    /// 查询Code在Main表的记录
+    /// </summary>
+    /// <param name="code"></param>
+    /// <returns></returns>
+        public Product GetProductByAssembleCode(string code)
+        {
+            try
+            {
+                return new ProductDAL().GetProductByAssembleCode(code);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+        public QMAPP.FJC.Entity.SendManage.PastCard GetLastPastCard(string workcentercode)
+        {
+            try
+            {
+                return new DAL.SendManage.SendPlanRecordDAL().GetLastPastCard(workcentercode);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        
+                    /// <summary>
+        /// 获得超时时间信息信息（列表）
+        /// </summary>
+        /// <param name="pFisOrder"></param>
+        /// <param name="pFistype"></param>
+        /// <returns></returns>
+        public DataTable GetTimeOutSet()
+        {
+            #region
+            try
+            {
+                #region
+                try
+                {
+                    return new DAL.TianJin.TJFrmPlaceDAL().GetLastPastCard();
+                }
+                catch (Exception ex)
+                {
+                    throw ex;
+                }
+                #endregion
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJOrderPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJOrderPlanBLL.cs
new file mode 100644
index 0000000..e82a362
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJOrderPlanBLL.cs
@@ -0,0 +1,1532 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.BLL;
+using QMAPP.Entity;
+using QMAPP.FJC.Entity.FIS;
+using QMFrameWork.Log;
+using QMAPP.FJC.Entity;
+using QMFrameWork.Data;
+using QMAPP.FJC.DAL.FIS;
+using System.Data;
+using QMAPP.FJC.BLL.Dict;
+using QMAPP.MD.Entity;
+using QMAPP.MD.DAL;
+using QMAPP.FJC.DAL.Basic;
+using QMAPP.FJC.Entity.ProductionPlan;
+using QMAPP.FJC.Entity.Basic;
+using QMAPP.FJC.DAL.ProductionPlan;
+using QMFrameWork.Common.Util;
+//using QMAPP.FJC.Entity.FileCopy.FIS;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using QMAPP.FJC.Entity.TianJin;
+using QMAPP.FJC.DAL.TianJin;
+
+namespace QMAPP.FJC.BLL.TianJin
+{
+    /// <summary>
+    /// 注塑计划管理
+    /// </summary>
+    public class TJOrderPlanBLL : BaseBLL
+    {
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public DataResult<TJOrderPlan> Get(TJOrderPlan model)
+        {
+            DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+            try
+            {
+                result.Result = new TJOrderPlanDAL().Get(model);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "订单计划信息逻辑层-获取信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataResult<DataPage> GetList(TJOrderPlan condition, DataPage page)
+        {
+            DataResult<DataPage> result = new DataResult<DataPage>();
+            try
+            {
+                //获取订单计划信息列表
+                page = new TJOrderPlanDAL().GetList(condition, page);
+
+                List<TJOrderPlan> list = page.Result as List<TJOrderPlan>;
+
+                #region 显示类型
+                //处理字典信息
+                DictManageBLL dictPRODUCEREQUIRE = new DictManageBLL(DictKind.PRODUCEREQUIRE);
+                DictManageBLL dictPLANSOURCE = new DictManageBLL(DictKind.PLANSOURCE);
+                DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+                foreach (var info in list)
+                {
+                    //info.PRODUCEREQUIRE = dictPRODUCEREQUIRE.GetDictValue(info.PRODUCEREQUIRE);
+                    //info.PLANSOURCE = dictPLANSOURCE.GetDictValue(info.PLANSOURCE);
+                    info.PLAN_STATE = dictPLANSTATE.GetDictValue(info.PLAN_STATE);
+                }
+                #endregion
+                result.Result = page;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-获取列表！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+
+        #endregion
+
+        #region 信息是否重复
+        /// <summary>
+        /// 判断名称是否存在
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns>true:已存在；fasel:不存在。</returns>
+        public int ExistsOrderPlan(TJOrderPlan model)
+        {
+            try
+            {
+                return new TJOrderPlanDAL().ExistsOrderPlan(model);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        public DataResult<int> Insert(TJOrderPlan model)
+        {
+            DataResult<int> result = new DataResult<int>();
+            //基本信息
+            model.PID = Guid.NewGuid().ToString();
+            model.PLAN_STATE = "0";
+
+            model.CREATEUSER = this.LoginUser.UserID;
+            model.CREATEDATE = DateTime.Now;
+            model.UPDATEUSER = model.CREATEUSER;
+            model.UPDATEDATE = model.CREATEDATE;
+            TJOrderPlanDAL cmdDAL = new TJOrderPlanDAL();
+            try
+            {
+                //if (ExistsOrderPlan(model) > 0)
+                //{
+                //    result.IsSuccess = false;
+                //    result.Msg = "该订单号已经存在!";
+                //    return result;
+                //}
+
+                //流水号信息
+                //FISPlan condition = new FISPlan();
+                //condition.PREFIX = "IN";
+                //condition.DATASTR = model.PLAN_DATE.ToString("yyyyMMdd");
+                //获取流水号
+                //FISPlan info = this.GetOrderPlanSeq(condition);
+
+                //model.PLAN_NO = condition.PREFIX + condition.DATASTR + info.SEQSTR;
+
+                result.Result = new TJOrderPlanDAL().Insert(model);
+
+                //痕迹表
+                //FISPlanRecord record = new FISPlanRecord();
+
+                //record.PID = Guid.NewGuid().ToString();
+                //record.MID = model.PID;
+                //record.PLAN_NO = model.PLAN_NO;
+                //record.MATERIAL_CODE = model.MATERIAL_CODE;
+                //record.PLAN_QTY = model.QTY;
+                //record.OPERATION_TYPE = "0";
+                //record.CREATEUSER = model.CREATEUSER;
+                //record.CREATEDATE = model.CREATEDATE;
+
+                //int no = new TJOrderPlanDAL().InsertRecord(record);
+
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-插入信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+        #endregion
+
+        #region 更新信息
+        /// <summary>
+        /// 更新信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        public DataResult<int> Update(TJOrderPlan model)
+        {
+            DataResult<int> result = new DataResult<int>();
+            model.UPDATEUSER = this.LoginUser.UserID;
+            try
+            {
+                if (ExistsOrderPlan(model) > 0)
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "该订单号已经存在!";
+                    return result;
+                }
+
+                //if (model.COMPLETE_QTY > model.QTY)
+                //{
+                //    result.IsSuccess = false;
+                //    result.Msg = "修改后的计划数量不能小于已完成数量!";
+                //    return result;
+                //}
+
+                if (model.PLAN_STATE == EnumGeter.PLANSTATE.COMPLATED.GetHashCode().ToString())
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "订单已经完成不能进行修改!";
+                    return result;
+                }
+                #region 如果修改后的计划数量等于完成数量，将计划状态更新为完成
+                //if (model.QTY.Equals(model.COMPLETE_QTY))
+                //{
+                //    model.PLAN_STATE = EnumGeter.PLANSTATE.COMPLATED.GetHashCode().ToString();
+                //}
+
+                #endregion
+
+                #region 判断数量
+
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+                TJOrderPlan initialOrderPlan = TJOrderPlanDAL.Get(new TJOrderPlan { PID = model.PID });
+                string deleteWorkOrderSql = "";
+                List<WorkOrder> workOrderList = new List<WorkOrder>();
+
+                WorkOrderDAL workOrderDal = new WorkOrderDAL();
+
+                //将计划数量调整变小,删除为生产的派工单
+                if ((initialOrderPlan.QTY - model.QTY) > 0)
+                {
+                    deleteWorkOrderSql = string.Format("delete from T_PP_WORKORDER where pid in (select top {0} pid from T_PP_WORKORDER where ORDERPLANID='{1}' and COMPLETE_QTY=0 )", (initialOrderPlan.QTY - model.QTY), initialOrderPlan.PID);
+                }
+                else
+                {
+                    List<WorkOrder> list = workOrderDal.GetList(new WorkOrder() { ORDERPLANID = initialOrderPlan.PID });
+
+                    if (list.Count > 0)
+                    {
+                        WorkOrder wo = list.First();
+
+                        //将计划数量调整变大
+                        for (int i = 0; i < (model.QTY - initialOrderPlan.QTY); i++)
+                        {
+                            WorkOrder inWO = BindHelper.CopyToModel<WorkOrder, WorkOrder>(wo, false);//CopyToModel<WorkOrder, WorkOrder>(wo);
+                            inWO.PID = Guid.NewGuid().ToString();
+                            inWO.COMPLETE_QTY = 0;
+                            workOrderList.Add(inWO);
+                        }
+                    }
+                    
+                }
+                #endregion
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    session.OpenTs();
+                    TJOrderPlanDAL.BaseSession = session;
+                    workOrderDal.BaseSession = session;
+
+                    Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE });
+                    if (pbomcode!=null)
+                    {
+                         //model.PBOM_CODE = pbomcode.PBOM_CODE;
+                    }
+                   
+
+                    TJOrderPlanDAL.Update(model);
+
+                    #region 插入修改信息痕迹表
+                    //插入修改信息痕迹表
+                    //FISPlanRecord record = new FISPlanRecord();
+
+                    //record.PID = Guid.NewGuid().ToString();
+                    //record.MID = model.PID;
+                    //record.PLAN_NO = model.PLAN_NO;
+                    //record.MATERIAL_CODE = model.MATERIAL_CODE;
+                    //record.PLAN_QTY = model.QTY;
+                    //record.OPERATION_TYPE = "1";
+                    //record.CREATEUSER = model.CREATEUSER;
+                    //record.CREATEDATE = model.CREATEDATE;
+
+                    //int no = new TJOrderPlanDAL().InsertRecord(record);
+                    #endregion
+
+                    if (string.IsNullOrEmpty(deleteWorkOrderSql) == false)
+                    {
+                        session.ExecuteSql(deleteWorkOrderSql, new List<DataParameter>().ToArray());
+                    }
+
+                    if (workOrderList.Count > 0)
+                    {
+                        foreach (var wo in workOrderList)
+                        {
+                            workOrderDal.Insert(wo);
+                        }
+                    }
+
+                    session.CommitTs();
+                }
+
+                result.IsSuccess = true;
+                result.Msg = "修改成功!";
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息逻辑层-更新信息！"
+                });
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+
+        private WorkOrder CopyToModel<T1, T2>(WorkOrder wo)
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>删除个数</returns>
+        public DataResult<int> Delete(string strs)
+        {
+            int count = 0;
+            string[] list = strs.Split(":".ToCharArray());
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+                WorkOrderDAL workOrderDal = new WorkOrderDAL();
+                //校验未通过的订单
+                List<TJOrderPlan> validOrderList = new List<TJOrderPlan>();
+                //可以删除的订单
+                List<TJOrderPlan> deleteOrderList = new List<TJOrderPlan>(); 
+                foreach (string str in list)
+                {
+                    TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = str });
+
+                    //去T_PP_WORkORDER表查询此计划下的派工单是否有不为0(初始)状态的派工信息，若有则不让删除
+                    int Num = workOrderDal.GetAllWorkOrder(str);
+
+                    //如果订单初始化或是确认生产并且生产数量为0
+                    //if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString()
+                    //    || (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && op.COMPLETE_QTY == 0 && Num==0))
+                    //{
+                    //    deleteOrderList.Add(op);
+                    //}
+                    //else
+                    //{
+                    //    validOrderList.Add(op);
+                    //}
+                }
+                if (validOrderList.Count > 0)
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "删除失败，只有计划状态为初始状态、执行状态并且完成数量为0的订单可以删除!";
+                    return result;
+                }
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    session.OpenTs();
+                    TJOrderPlanDAL.BaseSession = session;
+                    workOrderDal.BaseSession = session;
+
+                    foreach (var op in deleteOrderList)
+                    {
+                        //删除订单
+                        TJOrderPlanDAL.DeleteOrderPlan(op);
+                        //新增删除情况下的痕迹表信息
+                        #region 插入修改信息痕迹表
+                        //插入修改信息痕迹表
+                        //FISPlanRecord record = new FISPlanRecord();
+
+                        //record.PID = Guid.NewGuid().ToString();
+                        //record.MID = op.PID;
+                        //record.PLAN_NO = op.PLAN_NO;
+                        //record.MATERIAL_CODE = op.MATERIAL_CODE;
+                        //record.PLAN_QTY = op.QTY;
+                        //record.OPERATION_TYPE = "2";
+                        //record.CREATEUSER = op.CREATEUSER;
+                        //record.CREATEDATE = op.CREATEDATE;
+
+                        //int no = new TJOrderPlanDAL().InsertRecord(record);
+                        #endregion
+
+                        //删除订单下的派工单
+                        workOrderDal.BatchDeleteByOrderPlan(new WorkOrder() { ORDERPLANID = op.PID });
+                    }
+
+                    session.CommitTs();
+                }
+
+                result.Result = count;
+                result.Msg = "订单删除成功!";
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>删除个数</returns>
+        public int DeleteOrderPlan(TJOrderPlan model)
+        {
+            int count = 0;
+            int number = new TJOrderPlanDAL().DelCheck(model);
+            if (number > 0)
+            {
+                return count;
+            }
+            count = new TJOrderPlanDAL().Delete(model);
+            return count;
+        }
+        #endregion
+
+        #region 发布
+        /// <summary>
+        /// 发布信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>发布个数</returns>
+        public DataResult<int> PutOut(string strs)
+        {
+            string[] list = strs.Split(":".ToCharArray());
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+
+                List<TJOrderPlan> validorderPlanList = new List<TJOrderPlan>();
+                List<TJOrderPlan> putOutPlanList = new List<TJOrderPlan>();
+
+                foreach (string str in list)
+                {
+                    TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan { PID = str });
+
+                    if (op.PLAN_STATE != EnumGeter.PLANSTATE.INIT.GetHashCode().ToString())
+                    {
+                        validorderPlanList.Add(op);
+                    }
+
+                    putOutPlanList.Add(op);
+
+                }
+
+                if (validorderPlanList.Count > 0)
+                {
+                    result.IsSuccess = false;
+                    result.Msg = "只有初始状态下的订单能够进行发布!";
+
+                    return result;
+                }
+
+                DataTable totalDt = GetWorkOrderTable();
+                foreach (var op in putOutPlanList)
+                {
+                    op.PLAN_STATE = EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString();
+                    op.UPDATEUSER = this.LoginUser.UserID;
+                    totalDt = this.PutOutOrderPlan(op, totalDt);
+                }
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+                    IDbTransaction ids = dbConn.BeginTransaction();
+
+                    TJOrderPlanDAL.BaseSession = session;
+                    foreach (var op in putOutPlanList)
+                    {
+                        TJOrderPlanDAL.Update(op);
+                    }
+
+                    session.DbHelper.BulkCopyData(totalDt, "T_PP_WORKORDER", dbConn, ids);
+                    ids.Commit();
+                }
+
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 发布信息 
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>发布个数</returns>
+        public DataTable PutOutOrderPlan(TJOrderPlan info, DataTable workOrderDt)
+        {
+            WorkCellDAL workCelldal = new WorkCellDAL();
+            string pbomcode = info.MATERIAL_CODE;
+            List<QMAPP.MD.Entity.ProcessRouteWorkCellSeq> list = workCelldal.GetFirstWorkCell(pbomcode);
+
+            //注入派工单信息
+            for (int i = 0; i < info.QTY; i++)
+            {
+                if (list.Count > 0)
+                {
+                    foreach (var seq in list)
+                    {
+                        DataRow workOrder = workOrderDt.NewRow();
+
+                        workOrder["PID"] = Guid.NewGuid().ToString();
+                        workOrder["ORDERPLANID"] = info.PID;
+                        workOrder["ORDERPLAN_NO"] = (info.PLAN_NO.ToString() + (i + 1).ToString().PadLeft(4, '0'));
+                        workOrder["ORDER_TYPE"] = EnumGeter.WORKORDERTYPE.STOCK.GetHashCode().ToString();
+                        workOrder["SEQ"] = (i + 1).ToString();
+                        workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE;
+                        //workOrder["PBOM_CODE"] = info.PBOM_CODE;
+                        workOrder["QTY"] = 1;
+                        workOrder["COMPLETE_QTY"] = 0;
+                        workOrder["PLAN_DATE"] = info.PLAN_DATE;
+                        //workOrder["SHIFT_CODE"] = info.SHIFT_CODE;
+                        //workOrder["WORKCENTER_CODE"] = info.WORKCENTER_CODE;
+                        workOrder["WORKCELL_CODE"] = seq.WORKCELL_CODE;
+                        workOrder["WORKLOC_CODE"] = "";
+                        workOrder["REMARK"] = "";
+                        workOrder["EQPT_NAME"] = "";
+                        workOrder["EQPT_CODE"] = "";
+                        workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString();
+
+                        workOrderDt.Rows.Add(workOrder);
+                    }
+                }
+                else
+                {
+                    DataRow workOrder = workOrderDt.NewRow();
+
+                    workOrder["PID"] = Guid.NewGuid().ToString();
+                    workOrder["ORDERPLANID"] = info.PID;
+                    workOrder["ORDERPLAN_NO"] = (info.PLAN_NO.ToString() + (i + 1).ToString().PadLeft(4, '0'));
+                    workOrder["ORDER_TYPE"] = EnumGeter.WORKORDERTYPE.STOCK.GetHashCode().ToString();
+                    workOrder["SEQ"] = (i + 1).ToString();
+                    workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE;
+                    //workOrder["PBOM_CODE"] = info.PBOM_CODE;
+                    workOrder["QTY"] = 1;
+                    workOrder["COMPLETE_QTY"] = 0;
+                    workOrder["PLAN_DATE"] = info.PLAN_DATE;
+                    //workOrder["SHIFT_CODE"] = info.SHIFT_CODE;
+                    //workOrder["WORKCENTER_CODE"] = info.WORKCENTER_CODE;
+                    workOrder["WORKLOC_CODE"] = "";
+                    workOrder["REMARK"] = "";
+                    workOrder["EQPT_NAME"] = "";
+                    workOrder["EQPT_CODE"] = "";
+                    workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString();
+
+                    workOrderDt.Rows.Add(workOrder);
+                }
+
+            }
+
+            return workOrderDt;
+        }
+
+        /// <summary>
+        /// 插入TJOrderPlan
+        /// 写serveice和事物,重写方法.zxd20171101
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>发布个数</returns>
+        //public int InsertOrderPlanAndWorkOrder(TJOrderPlan model,IDataSession tempSession)
+        //{
+        //    var TJOrderPlanDAL = new TJOrderPlanDAL();
+        //    TJOrderPlanDAL.BaseSession = tempSession;
+        //    int count = 0;
+        //    //给ordePlan赋值
+        //    ///////////////////
+        //    //Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE });
+        //    //if (pbomcode != null)
+        //    //{
+        //    //    model.PBOM_CODE = pbomcode.PBOM_CODE;
+        //    //}
+        //    //QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE);
+        //    //if (routecode != null)
+        //    //{
+        //    //    model.ROUTE_CODE = routecode.ROUTE_CODE;
+        //    //}
+        //    //string workcentercode = new WorkCellDAL().GetWorkcenterWithMaterial(model.MATERIAL_CODE);
+        //    //if (workcentercode != null)
+        //    //{
+        //    //    model.WORKCENTER_CODE = workcentercode;
+        //    //}
+        //    //赋值新session后插入 zxd20171101
+        //    TJOrderPlanDAL.Insert(model);
+
+
+        //    //获取当前PID下注塑计划数量
+        //    TJOrderPlan info = TJOrderPlanDAL.Get(model);
+        //    DataTable workOrderDt = GetWorkOrderTable();
+        //    int number = TJOrderPlanDAL.PutOutCheck(model);
+        //    if (number == 1)
+        //    {
+        //        return count;
+        //    }
+
+        //    var wodDal = new WorkOrderDAL();
+        //    List<QMAPP.MD.Entity.ProcessRouteWorkCellSeq> list = new WorkCellDAL().GetFirstWorkCell(model.PBOM_CODE);
+
+        //    wodDal.BaseSession = tempSession;
+        //    //注入派工单信息
+        //    for (int i = 0; i < info.QTY; i++)
+        //    {
+        //        //DataRow workOrder = workOrderDt.NewRow();
+        //        var workOrder = new WorkOrder();
+
+        //        workOrder.PID= Guid.NewGuid().ToString();
+        //        workOrder.ORDERPLANID = info.PID;
+        //        workOrder.ORDERPLAN_NO = (info.PLAN_NO.ToString() + (i + 1).ToString().PadLeft(4, '0'));
+        //        workOrder.ORDER_TYPE = EnumGeter.WORKORDERTYPE.FIS.GetHashCode().ToString();
+        //        workOrder.SEQ = info.PLAN_SEQ;
+        //        workOrder.MATERIAL_CODE = info.MATERIAL_CODE;
+        //        //workOrder.PBOM_CODE = info.PBOM_CODE;
+        //        workOrder.QTY = 1;
+        //        workOrder.COMPLETE_QTY = 0;
+        //        workOrder.PLAN_DATE = info.PLAN_DATE;
+        //        //workOrder.SHIFT_CODE = info.SHIFT_CODE;
+        //        //workOrder.WORKCENTER_CODE = info.WORKCENTER_CODE;
+        //        //WorkCell workcellcode = new WorkCellDAL().Get(new WorkCell { WORKCENTER_CODE = info.WORKCENTER_CODE });
+        //        workOrder.WORKCELL_CODE = (list.Count > 0) ? list[0].WORKCELL_CODE : "";
+        //        workOrder.WORKLOC_CODE = "";
+        //        workOrder.REMARK = "";
+        //        workOrder.EQPT_NAME = "";
+        //        workOrder.EQPT_CODE = "";
+        //        workOrder.STATE = EnumGeter.WORKPLANSTATE.INIT.GetHashCode();
+        //        workOrder.PRI = 0;
+        //        //workOrder.UPDATEDATE=DateTime.Now;
+        //        workOrder.PRINTED = "0";
+        //        wodDal.Insert(workOrder);
+        //        //workOrderDt.Rows.Add(workOrder);
+        //    }
+        //    count = TJOrderPlanDAL.PutOutBaseSession(model, workOrderDt);
+        //    return count;
+        //}
+
+        #endregion
+
+        #region 导出数据
+        /// <summary>
+        /// 获取导出的数据
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <returns>数据</returns>
+        public DataTable GetExportData(TJOrderPlan model)
+        {
+            try
+            {
+                DataTable dt = new TJOrderPlanDAL().GetExportData(model);
+
+                DictManageBLL dictPRODUCEREQUIRE = new DictManageBLL(DictKind.PRODUCEREQUIRE);
+                DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+                DictManageBLL dictPLANSOURCE = new DictManageBLL(DictKind.PLANSOURCE);
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //替换状态类别显示值
+                    dr["PRODUCEREQUIRE"] = dictPRODUCEREQUIRE.GetDictValue(dr["PRODUCEREQUIRE"].ToString());
+                    dr["PLAN_STATE"] = dictPLANSTATE.GetDictValue(dr["PLAN_STATE"].ToString());
+                    dr["PLANSOURCE"] = dictPLANSOURCE.GetDictValue(dr["PLANSOURCE"].ToString());
+                }
+                
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+        #endregion
+
+        #region 导入数据
+        /// <summary>
+        /// 导入Excel表数据
+        /// </summary>
+        /// <param name="list">Excel列表</param>
+        /// <param name="aramodel">物料信息</param>
+        /// <param name="plantmodel">班次信息</param>
+        /// <param name="productbasicmodel">零件类别信息</param>
+        /// <returns>结果</returns>
+        //public DataResult<ImportMessage> GetImportData(List<TJOrderPlan> list, Material condition, MachineInfo machine, ProduceShift produceshiftmodel, WorkCell workcellmodel)
+        //{
+        //    DataResult<ImportMessage> result = new DataResult<ImportMessage>();
+        //    TJOrderPlanDAL cmDal = new TJOrderPlanDAL();
+        //    cmDal.BaseSession = AppDataFactory.CreateMainSession();
+        //    List<TJOrderPlan> List = new List<TJOrderPlan>();
+        //    List<WorkOrder> workOrderList = new List<WorkOrder>();
+
+        //    DataTable orderDt = GetOrderPlanTable();
+        //    DataTable workOrderDt = GetWorkOrderTable();
+        //    int index = 0;
+        //    int num = 0;
+        //    try
+        //    {
+        //        result.Result = new ImportMessage();
+        //        result.Result.Errors = new List<RowError>();
+        //        List<Material> materialinfo = null;
+        //        List<ProduceShift> produceshiftinfo = null;
+        //        List<MachineInfo> machineList = null;
+        //        ///获取物料信息(PBOM表)
+        //        materialinfo = new QMAPP.MD.BLL.MaterialBLL().GetMaterialForOrder(workcellmodel.WORKCELL_CODE);
+        //        //获取班次信息
+        //        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)
+        //        {
+        //            if (string.IsNullOrEmpty(ma.InfoError))
+        //            {
+        //            #region 状态判断
+        //            index++;
+        //            num++;
+        //            //物料
+        //            Material areaMes = materialinfo.Find(a => a.MATERIAL_CODE == ma.MATERIAL_CODE.Trim());
+        //            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;
+        //            }
+        //            //班次
+        //            //Shift plantMes = produceshiftinfo.Find(p => p.SHIFT_CODE == ma.SHIFT_CODE.Trim());
+        //            //if (plantMes != null)
+        //            //{
+        //            //    ma.SHIFT_CODE = plantMes.SHIFT_CODE;
+        //            //}
+        //            //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.Trim().Equals("以数量为准"))
+        //                {
+        //                    ma.PRODUCEREQUIRE = "0";
+        //                }
+        //                else if (ma.PRODUCEREQUIRE.Trim().Equals("以时间为准"))
+        //                {
+        //                    ma.PRODUCEREQUIRE = "1";
+        //                }
+        //                else
+        //                {
+        //                    ma.PRODUCEREQUIRE = null;
+        //                    result.Result.Errors.Add(new RowError(index, "生产要求信息错误"));
+        //                    result.Result.failureNum += 1;
+        //                    continue;
+        //                }
+        //            }
+
+        //            //设备
+        //            MachineInfo machineMes = machineList.Find(c => c.MACHINECODDE == ma.MACHINECODDE.Trim());
+        //            if (machineMes != null)
+        //            {
+        //                ma.MACHINECODDE = ma.MACHINECODDE;
+        //            }
+        //            else
+        //            {
+        //                ma.MACHINECODDE = null;
+        //                result.Result.Errors.Add(new RowError(index, "设备信息不存在"));
+        //                result.Result.failureNum += 1;
+        //                continue;
+        //            }
+
+        //            //if (machineList.Count(o => o.MACHINECODDE.Trim() == ma.MACHINECODDE.ToUpper()) > 0)
+        //            //{
+        //            //    ma.MACHINECODDE = ma.MACHINECODDE;
+        //            //}
+        //            //else
+        //            //{
+        //            //    ma.MACHINECODDE = null;
+        //            //    result.Result.Errors.Add(new RowError(index, "设备不符"));
+        //            //    result.Result.failureNum += 1;
+        //            //    continue;
+        //                //}
+
+        //                #region 时间
+        //                //计划日期
+        //            DateTime dateTime = new DateTime();
+        //            bool convertResult = DateTime.TryParse(ma.PLAN_DATEIN, out dateTime);
+        //            if (!convertResult)
+        //            {
+        //                result.Result.Errors.Add(new RowError(index, "计划日期格式错误!"));
+        //                result.Result.failureNum += 1;
+        //                continue;
+        //            }
+        //            else
+        //            {
+        //                DateTimeFormatInfo dtFormat1 = new DateTimeFormatInfo();
+        //                dtFormat1.ShortDatePattern = "yyyy/MM/dd";
+        //                ma.PLAN_DATE = Convert.ToDateTime(ma.PLAN_DATEIN, dtFormat1);
+        //            }
+        //            //开始日期
+        //            bool convertResultstart = DateTime.TryParse(ma.STARTTIMEIN, out dateTime);
+        //            if (!convertResultstart)
+        //            {
+        //                result.Result.Errors.Add(new RowError(index, "开始日期格式错误!"));
+        //                result.Result.failureNum += 1;
+        //                continue;
+        //            }
+        //            else
+        //            {
+        //                DateTimeFormatInfo dtFormat2 = new DateTimeFormatInfo();
+        //                dtFormat2.ShortDatePattern = "yyyy/MM/dd hh:mm:ss";
+        //                ma.STARTTIME = Convert.ToDateTime(ma.STARTTIMEIN, dtFormat2);
+        //            }
+
+        //            //截止日期
+        //            bool convertResultend = DateTime.TryParse(ma.ENDTIMEIN, out dateTime);
+        //            if (!convertResultend)
+        //            {
+        //                result.Result.Errors.Add(new RowError(index, "截止日期格式错误!"));
+        //                result.Result.failureNum += 1;
+        //                continue;
+        //            }
+        //            else
+        //            {
+        //                DateTimeFormatInfo dtFormat3 = new DateTimeFormatInfo();
+        //                dtFormat3.ShortDatePattern = "yyyy/MM/dd hh:mm:ss";
+        //                ma.ENDTIME = Convert.ToDateTime(ma.ENDTIMEIN, dtFormat3);
+        //            }
+
+        //                #endregion
+
+        //            #endregion
+        //            }
+        //            if (string.IsNullOrEmpty(ma.InfoError) == false)
+        //            {
+        //                ma.PID = null;
+        //                result.Result.failureNum += 1;
+        //                continue;
+        //            }
+
+
+        //            //修改改时根据主键等信息获取详细内容信息
+        //            //TJOrderPlan oldInfo = cmDal.GetInfo(ma);
+
+        //            #region 注释掉另一种导入增加和更新
+        //            //增加
+        //            //DataRow odr = orderDt.NewRow();
+        //            //odr["PID"] = Guid.NewGuid().ToString();
+        //            //odr["FACTORY_CODE"] = "";
+        //            //odr["PLAN_NO"] = "";
+        //            //odr["PLAN_SEQ"] = "";
+        //            //odr["PLAN_STATE"] = EnumGeter.PLANSTATE.INIT.GetHashCode().ToString();
+        //            //odr["MATERIAL_CODE"] = ma.MATERIAL_CODE;
+        //            //odr["PBOM_CODE"] = "";
+        //            //odr["QTY"] = ma.QTY;
+        //            //odr["COMPLETE_QTY"] = ma.QTY;
+        //            //odr["PLAN_DATE"] = ma.PLAN_DATE;
+        //            //odr["SHIFT_CODE"] = "";
+        //            //odr["PLANSOURCE"] = DBNull.Value;
+        //            //odr["PRODUCEREQUIRE"] = ma.PRODUCEREQUIRE;
+        //            //odr["CREATEDATE"] = System.DateTime.Now;
+        //            //odr["CREATEUSER"] = this.LoginUser.UserID;
+        //            //odr["UPDATEDATE"] = System.DateTime.Now;
+        //            //odr["UPDATEUSER"] = this.LoginUser.UserID;
+        //            //odr["WORKCENTER_CODE"] = "ZS";
+        //            //orderDt.Rows.Add(odr);
+                   
+        //            //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
+        //            //{
+        //            #endregion
+
+        //            //新增
+        //                //oldInfo = new TJOrderPlan();
+        //                ma.PID = Guid.NewGuid().ToString();
+        //                //ma.PLAN_NO = ma.PLAN_NO;
+
+        //                //FISPlan planinfo = new FISPlan();
+        //                //planinfo.PREFIX = "IN";
+        //                ////planinfo.DATASTR = ma.PLAN_DATE.ToString("yyyyMMdd");
+        //                //////获取流水号
+        //                //planinfo = this.GetOrderPlanSeq(planinfo);
+        //                //planinfo.DATASTR = ma.PLAN_DATE.ToString("yyyyMMdd");
+        //                //ma.PLAN_NO = planinfo.PREFIX + planinfo.DATASTR + planinfo.SEQSTR;
+
+        //                //ma.PLAN_NO = planinfo.PREFIX+ma.PLAN_NO;
+
+        //                //int no = new DoorPlankPlanDAL().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 });
+        //                if (pbomcode != null)
+        //                {
+        //                    ma.PBOM_CODE = pbomcode.PBOM_CODE;
+        //                }
+        //                //工艺路线
+        //                QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(ma.MATERIAL_CODE);
+        //                if (routecode != null)
+        //                {
+        //                    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);
+        //            #region 注入派工单信息（已注释）
+        //            ////注入派工单信息
+        //            //for (int i = 0; i < ma.QTY; i++)
+        //            //{
+        //            //    DataRow workOrder = workOrderDt.NewRow();
+
+        //            //    workOrder["PID"] = Guid.NewGuid().ToString();
+        //            //    workOrder["ORDERPLANID"] = odr["PID"];
+        //            //    workOrder["ORDERPLAN_NO"] = (odr["PLAN_NO"].ToString() + (i + 1).ToString().PadLeft(4, '0'));
+        //            //    workOrder["ORDER_TYPE"] = EnumGeter.WORKORDERTYPE.PROCEDURE.GetHashCode().ToString();
+        //            //    workOrder["SEQ"] = (i + 1).ToString();
+        //            //    workOrder["MATERIAL_CODE"] = ma.MATERIAL_CODE;
+
+        //            //    workOrder["PBOM_CODE"] = "";
+        //            //    workOrder["QTY"] = 1;
+        //            //    workOrder["COMPLETE_QTY"] = 0;
+        //            //    workOrder["PLAN_DATE"] = ma.PLAN_DATE;
+        //            //    workOrder["SHIFT_CODE"] = "";
+
+        //            //    workOrder["WORKCENTER_CODE"] = "";
+
+        //            //    workOrder["WORKCELL_CODE"] = "";
+        //            //    workOrder["WORKLOC_CODE"] = "";
+        //            //    workOrder["REMARK"] = "";
+        //            //    workOrder["EQPT_NAME"] = "";
+        //            //    workOrder["EQPT_CODE"] = "";
+        //            //    workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString();
+
+        //            //    workOrderDt.Rows.Add(workOrder);
+        //            //}
+        //            #endregion
+        //        }
+
+        //        cmDal.GetImportData(List);
+        //        result.Msg = "导入成功";
+        //        result.IsSuccess = true;
+        //        return result;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        result.IsSuccess = false;
+        //        result.Ex = ex;
+        //        return result;
+        //    }
+        //}
+       
+        #endregion
+
+        #region 获取产品表
+        /// <summary>
+        /// 获取产品表
+        /// </summary>
+        /// <returns></returns>
+        private DataTable GetOrderPlanTable()
+        {
+            DataTable dt = new DataTable();
+
+            dt.Columns.Add(new DataColumn() { ColumnName = "PID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "FACTORY_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_NO", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_SEQ", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_STATE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MATERIAL_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PBOM_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ROUTE_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "REMARK", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "COMPLETE_QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_DATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "SHIFT_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLANSOURCE", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PRODUCEREQUIRE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "CREATEDATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "CREATEUSER", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "UPDATEDATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "UPDATEUSER", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCENTER_CODE", DataType = typeof(string) });
+
+            return dt;
+        }
+
+        private DataTable GetWorkOrderTable()
+        {
+            DataTable dt = new DataTable();
+
+            dt.Columns.Add(new DataColumn() { ColumnName = "PID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ORDERPLANID", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ORDERPLAN_NO", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "ORDER_TYPE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "SEQ", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "MATERIAL_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PBOM_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "COMPLETE_QTY", DataType = typeof(int) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "PLAN_DATE", DataType = typeof(DateTime) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "SHIFT_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCENTER_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCENTER_NAME", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCELL_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKCELL_NAME", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "WORKLOC_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "REMARK", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "EQPT_NAME", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "EQPT_CODE", DataType = typeof(string) });
+            dt.Columns.Add(new DataColumn() { ColumnName = "STATE", DataType = typeof(int) });
+
+            return dt;
+        }
+        #endregion
+
+        #region 根据WINFORM修改订单状态
+        /// <summary>
+        /// 根据WINFORM修改订单状态
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新个数</returns>
+        public DataResult<int> ChangeOrderPlan(TJOrderPlan info)
+        {
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+
+                List<TJOrderPlan> ChangePlanList = new List<TJOrderPlan>();
+                List<TJOrderPlan> validOrderList = new List<TJOrderPlan>();
+                TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { MATERIAL_CODE = info.MATERIAL_CODE, PLAN_STATES = (EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() + ',' + EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString()) });
+                if (op == null)
+                {
+                    result.IsSuccess = false;
+                    return result;
+                }
+                //如果订单初始化或是确认生产
+                if (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString()
+                    || op.PLAN_STATE == EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString() )
+                {
+                    ChangePlanList.Add(op);
+                }
+                else
+                {
+                    validOrderList.Add(op);
+                }
+
+                if (validOrderList.Count > 0)
+                {
+                    result.IsSuccess = false;
+                    return result;
+                }
+
+                //更新TJOrderPlan相应字段
+                //if (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString())
+                //{
+                //    op.PLAN_STATE = EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString();
+                //    op.COMPLETE_QTY = op.COMPLETE_QTY + 1;
+                //}
+                //else if (op.COMPLETE_QTY + 1 < op.QTY && op.PLAN_STATE == EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString())
+                //{
+                //    op.PLAN_STATE = EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString();
+                //    op.COMPLETE_QTY = op.COMPLETE_QTY + 1;
+                //}
+                //else if (op.COMPLETE_QTY + 1 >= op.QTY && op.PLAN_STATE == EnumGeter.PLANSTATE.CREATING.GetHashCode().ToString())
+                //{
+                //    op.PLAN_STATE = EnumGeter.PLANSTATE.COMPLATED.GetHashCode().ToString();
+                //    op.COMPLETE_QTY = op.COMPLETE_QTY + 1;
+                //}
+                //更新workorder相应字段
+                WorkOrderDAL workOrderDal = new WorkOrderDAL();
+                WorkOrder wo = workOrderDal.GetworkOrderInfo(new WorkOrder() { ORDERPLANID = op.PID });
+                if(wo.PID!=null)
+                {
+                wo.COMPLETE_QTY = 1;
+                wo.STATE = 3;
+                }
+
+               using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    session.OpenTs();
+                    TJOrderPlanDAL.BaseSession = session;
+                    workOrderDal.BaseSession = session;
+
+                //更新订单
+                TJOrderPlanDAL.ChangeOrderPlan(op);
+
+                //更新订单下的派工单
+                workOrderDal.ChangeByOrderPlan(wo);
+                session.CommitTs();
+                }
+                result.IsSuccess = true;
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 获取订单信息
+        /// <summary>
+        /// 获取订单信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public TJOrderPlan GetOrderPlantState(TJOrderPlan condition)
+        {
+            TJOrderPlan result = new TJOrderPlan();
+            try
+            {
+                result = new TJOrderPlanDAL().Get(condition);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return result;
+        }
+        #endregion
+
+        #region GetBreakFIS
+        /// <summary>
+        /// 
+        /// </summary>
+        public void GetBreakFIS()
+        {
+            DAL.ProductionPlan.WorkOrderDAL workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
+
+            //获取当前工序优先级最高的工单
+            var workorder = workorderdal.GetMatchOrders("");
+            if (workorder.Count > 0)
+            {
+                if (string.Equals(workorder[0].ORDER_TYPE, "0")) //如果为FIS工单
+                {
+                    //获取前一个FIS计划顺序号
+                    var lastseqstr = workorderdal.GetLastFISSEQ(workorder[0].PLAN_DATE, workorder[0].WORKCENTER_CODE);
+                    if (!string.IsNullOrEmpty(lastseqstr))
+                    {
+                        int maxseq = 1999;
+                        int minseq = 1;
+                        int lastseq = int.Parse(lastseqstr);
+                        int currentseq = int.Parse(workorder[0].SEQ);
+                        if (lastseq < maxseq)
+                        {
+                            if (currentseq - lastseq > 1)
+                            {
+                                }
+                        }
+                        else
+                        {
+                            if (currentseq != minseq)
+                            {
+                                }
+                        }
+                    }
+                }
+            }
+        }
+#endregion 
+
+        #region 获取流水号信息
+        /// <summary>
+        /// 获取流水号信息
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <returns></returns>
+        //public FISPlan GetOrderPlanSeq(FISPlan condition)
+        //{
+        //    FISPlan fisplan = new FISPlan();
+        //    TJOrderPlanDAL TJOrderPlanDAL = new TJOrderPlanDAL();
+        //    //根据表皮条码获取本体信息
+
+        //    try
+        //    {
+        //        fisplan = new TJOrderPlanDAL().GetOrderPlanSeq(condition);
+        //        //若存在记录，流水号加1，且更新
+        //        if (fisplan!=null)
+        //        {
+        //            string seqstr = (Convert.ToInt32(fisplan.SEQSTR) + 1).ToString().PadLeft(4, '0');
+        //            fisplan.SEQSTR = seqstr;
+        //            //更新表T_AW_FISPLAN数据
+        //            using (IDataSession session = AppDataFactory.CreateMainSession())
+        //            {
+        //                session.OpenTs();
+        //                TJOrderPlanDAL.BaseSession = session;
+
+        //                TJOrderPlanDAL.UpdateFisPlan(fisplan);
+
+        //                session.CommitTs();
+        //            }
+        //        }
+        //        //不存在则插入此日期信息
+        //        else {
+        //            FISPlan planinfo = new FISPlan();
+        //            planinfo.PID = Guid.NewGuid().ToString();
+        //            planinfo.PREFIX = condition.PREFIX;
+        //            planinfo.DATASTR = condition.DATASTR;
+        //            planinfo.SEQSTR = "0001";
+        //            using (IDataSession session = AppDataFactory.CreateMainSession())
+        //            {
+        //                session.OpenTs();
+        //                TJOrderPlanDAL.BaseSession = session;
+
+        //                TJOrderPlanDAL.InsertFisPlan(planinfo);
+
+        //                session.CommitTs();
+        //            }
+        //            return planinfo;
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "注塑逻辑层-获取流水号本体信息！"
+        //        });
+        //        throw ex;
+        //    }
+        //    return fisplan;
+        //}
+        #endregion 
+
+        #region 痕迹表
+        /// <summary>
+        /// 获取人员信息(分页）
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        //public DataResult<DataPage> FisPlanRecordList(FISPlanRecord condition, DataPage page)
+        //{
+        //    DataResult<DataPage> result = new DataResult<DataPage>();
+        //    try
+        //    {
+        //        //获取生产版本项目信息列表
+        //        DataPage dataPage = new TJOrderPlanDAL().FisPlanRecordList(condition, page);
+
+        //        #region 转换使用状态显示类型
+        //        List<FISPlanRecord> operatorList = dataPage.Result as List<FISPlanRecord>;
+
+        //        DictManageBLL dictOPERATORSTATE = new DictManageBLL(DictKind.OperatioType);
+        //        foreach (var info in operatorList)
+        //        {
+        //            info.OPERATION_TYPE = dictOPERATORSTATE.GetDictValue(info.OPERATION_TYPE);
+        //        }
+        //        #endregion
+        //        result.Result = dataPage;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "设备信息维护逻辑层-获取人员列表！"
+        //        });
+        //        result.IsSuccess = false;
+        //        result.Msg = Resource.SystemException;
+        //        return result;
+        //    }
+        //    result.IsSuccess = true;
+        //    return result;
+        //}
+
+        #endregion
+
+
+
+        #region 计划操作记录
+
+        //public DataResult<DataPage> GetTraceList(OrderPlanTrace condition, DataPage page)
+        //{
+        //    DataResult<DataPage> result = new DataResult<DataPage>();
+        //    try
+        //    {
+        //        //获取订单计划信息列表
+        //        page = new TJOrderPlanDAL().GetTraceList(condition, page);
+
+        //        List<OrderPlanTrace> list = page.Result as List<OrderPlanTrace>;
+
+        //        #region 显示类型
+        //        //处理字典信息
+        //        DictManageBLL dictPRODUCEREQUIRE = new DictManageBLL(DictKind.PRODUCEREQUIRE);
+        //        DictManageBLL dictPLANSOURCE = new DictManageBLL(DictKind.PLANSOURCE);
+        //        DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+        //        foreach (var info in list)
+        //        {
+        //            info.PRODUCEREQUIRE = dictPRODUCEREQUIRE.GetDictValue(info.PRODUCEREQUIRE);
+        //            info.PLANSOURCE = dictPLANSOURCE.GetDictValue(info.PLANSOURCE);
+        //            info.PLAN_STATE = dictPLANSTATE.GetDictValue(info.PLAN_STATE);
+        //        }
+        //        #endregion
+        //        result.Result = page;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "信息逻辑层-获取列表！"
+        //        });
+        //        result.IsSuccess = false;
+        //        result.Msg = Resource.SystemException;
+        //        throw ex;
+        //    }
+        //    result.IsSuccess = true;
+        //    return result;
+        //}
+        //public DataTable GetExportDataTrace(OrderPlanTrace model)
+        //{
+        //    try
+        //    {
+        //        DataTable dt = new TJOrderPlanDAL().GetExportDataTrace(model);
+
+        //        DictManageBLL dictPRODUCEREQUIRE = new DictManageBLL(DictKind.PRODUCEREQUIRE);
+        //        DictManageBLL dictPLANSTATE = new DictManageBLL(DictKind.PLAN_STATE);
+        //        DictManageBLL dictPLANSOURCE = new DictManageBLL(DictKind.PLANSOURCE);
+        //        foreach (DataRow dr in dt.Rows)
+        //        {
+        //            //替换状态类别显示值
+        //            dr["PRODUCEREQUIRE"] = dictPRODUCEREQUIRE.GetDictValue(dr["PRODUCEREQUIRE"].ToString());
+        //            dr["PLAN_STATE"] = dictPLANSTATE.GetDictValue(dr["PLAN_STATE"].ToString());
+        //            dr["PLANSOURCE"] = dictPLANSOURCE.GetDictValue(dr["PLANSOURCE"].ToString());
+        //        }
+        //        //根据所选信息进行导出
+        //        if (string.IsNullOrEmpty(model.PIDList) == false)
+        //        {
+        //            model.PIDList = "'" + model.PIDList.Replace(":", "','") + "'";
+        //            DataView dv = new DataView(dt);
+        //            dv.RowFilter = "PID in (" + model.PIDList + ")";
+
+        //            dt = dv.ToTable();
+        //        }
+        //        return dt;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+
+        //}
+        #endregion
+
+        public DataResult<TJOrderPlan> GetPlanWithOrderNo(string orderno, bool CreateIfNotExists)
+        {
+            string regexp_full = "^D\\d{2}\\w+[RF][LR]\\d{2}(10|11|12|0[1-9])(30|31|2\\d|1\\d|0[1-9])\\w\\d{5}$";
+            string regexp_prefix = "^D\\d{2}\\w+(?=[RF][LR]\\d{6})";
+            string regexp_position = "[RF][LR](?=\\d{6})";
+            string regexp_date = "(?<=[RF][LR])\\d{2}(10|11|12|0[1-9])(30|31|2\\d|1\\d|0[1-9])";
+            string regexp_seq = "\\d{5}$";
+
+            var plandal = new TJOrderPlanDAL();
+            var workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
+            //Entity.FIS.TJOrderPlan plan = null;
+            Entity.ProductionPlan.WorkOrder order = null;
+            order = workorderdal.GetOneByOrderNO(orderno);
+
+            if (order == null)
+            {
+                if (!Regex.IsMatch(orderno, regexp_full))
+                {
+                    var plan = plandal.Get(new TJOrderPlan { PLAN_NO = orderno.Substring(0, orderno.Length - 4) });
+                    if (plan != null)
+                    {
+                        return new DataResult<TJOrderPlan> { Result = plan, IsSuccess = true, MsgCode = "1" };
+                    }
+                    else
+                    {
+                        return new DataResult<TJOrderPlan> { IsSuccess = false, Ex = new Exception("未查询到此FIS条码对应的计划工单,此工单可能已完成或删除！") };
+                    }
+                }
+                else
+                {
+                    var plan = plandal.Get(new TJOrderPlan { PLAN_NO = orderno });
+                    if (plan != null)
+                    {
+                        return new DataResult<TJOrderPlan> { Result = plan, IsSuccess = true, MsgCode = "1" };
+                    }
+                }
+                string codeprefix = Regex.Match(orderno, regexp_prefix).Value;
+                string positioncode = Regex.Match(orderno, regexp_position).Value;
+                string date = Regex.Match(orderno, regexp_date).Value;
+                string seq = Regex.Match(orderno, regexp_seq).Value;
+
+                string materialcode = new DAL.FIS.FISPhraseDAL().GetMESModulCode(codeprefix, positioncode);
+                if (string.IsNullOrWhiteSpace(materialcode))
+                {
+                    return new DataResult<TJOrderPlan> { IsSuccess = false, Ex = new Exception("FIS码未能识别,FIS短语字典配置不准确或未更新！") };
+                    
+                    //throw new ;
+                }
+
+                DateTime plandate
+                = new DateTime(2000 + int.Parse(date.Substring(0, 2))
+                    , int.Parse(date.Substring(2, 2))
+                    , int.Parse(date.Substring(4, 2)));
+
+                var nplan = new TJOrderPlan
+                {
+                    CREATEDATE = DateTime.Now,
+                    //COMPLETE_QTY = 0,
+                    CREATEUSER = "",
+                    MATERIAL_CODE = materialcode,//////////////////
+                    PID = Guid.NewGuid().ToString(),
+                    PLAN_DATE = plandate,////////////
+                    PLAN_NO = orderno,
+                    PLAN_SEQ = seq,//////////////////
+                    PLAN_STATE = "1",
+                    //PLANSOURCE = "0",
+                    QTY = 1,
+                    UPDATEUSER = "",
+                    UPDATEDATE = DateTime.Now,
+                };
+
+                Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = nplan.MATERIAL_CODE });
+                //if (pbomcode != null)
+                //{
+                //    nplan.PBOM_CODE = pbomcode.PBOM_CODE;
+                //}
+                QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(nplan.MATERIAL_CODE);
+                //if (routecode != null)
+                //{
+                //    nplan.ROUTE_CODE = routecode.ROUTE_CODE;
+                //}
+                string workcentercode = new WorkCellDAL().GetWorkcenterWithMaterial(nplan.MATERIAL_CODE);
+                //if (workcentercode != null)
+                //{
+                //    nplan.WORKCENTER_CODE = workcentercode;
+                //}
+                //赋值新session后插入 zxd20171101
+                if (CreateIfNotExists)
+                {
+                    plandal.Insert(nplan);
+                    return new DataResult<TJOrderPlan> { Result = nplan, IsSuccess = true, MsgCode = "1" };
+                }
+                return new DataResult<TJOrderPlan> { Result = nplan, IsSuccess = true, MsgCode = "0" };
+            }
+            else
+            {
+                var plan = plandal.GetOne(new TJOrderPlan { PID = order.ORDERPLANID });
+                return new DataResult<TJOrderPlan> { Result = plan, IsSuccess = true, MsgCode = "1" };
+            }
+        }
+
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
index fc9901e..9d366e4 100644
--- a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
+++ b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
@@ -174,6 +174,10 @@
     <Compile Include="SA\WorkcellQtyCountDAL.cs" />
     <Compile Include="SendManage\SendPlanRecordDAL.cs" />
     <Compile Include="Stocktaking\StocktakingDAL.cs" />
+    <Compile Include="TianJin\TJDoorPlankPlanDAL.cs" />
+    <Compile Include="TianJin\TJFrmPlaceDAL.cs" />
+    <Compile Include="TianJin\TJOrderPlanDAL.cs" />
+    <Compile Include="TianJin\TJWorkOrderDAL.cs" />
     <Compile Include="WarehouseManage\OutWarehouseDAL.cs" />
     <Compile Include="WarehouseManage\InWarehouseDAL.cs" />
     <Compile Include="WarnManage\EquipMentAlarmDAL.cs" />
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs
new file mode 100644
index 0000000..8c54265
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs
@@ -0,0 +1,1017 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.FJC.Entity.FIS;
+using System.Data;
+using QMFrameWork.Data;
+using QMFrameWork.Log;
+using QMAPP.Entity;
+using QMAPP.DAL;
+using QMAPP.FJC.Entity.FileCopy.FIS;
+using QMAPP.FJC.Entity.TianJin;
+using QMAPP.FJC.Entity.Basic;
+
+namespace QMAPP.FJC.DAL.TianJin
+{
+    /// <summary>
+    /// 门板计划管理
+    /// 
+    /// 
+    /// </summary>
+    public class TJDoorPlankPlanDAL : BaseDAL
+    {
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public TJOrderPlan Get(TJOrderPlan model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_PP_TJFY_ORDERPLAN WHERE '1'='1'";
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    sql += " AND PID = @PID";
+                    parameters.Add(new DataParameter("PID", model.PID));
+                }
+                if (string.IsNullOrEmpty(model.PLAN_NO) == false)
+                {
+                    sql += " AND PLAN_NO = @PLAN_NO";
+                    parameters.Add(new DataParameter("PLAN_NO", model.PLAN_NO));
+                }
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    model = session.Get<TJOrderPlan>(sql, parameters.ToArray());
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "门板信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataPage GetList(TJOrderPlan condition, DataPage page)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = this.GetQuerySql(condition, ref parameters);
+                //分页关键字段及排序
+                page.KeyName = "PID";
+                if (string.IsNullOrEmpty(page.SortExpression))
+                {
+                    page.SortExpression = "PLAN_DATE DESC,PLAN_SEQ DESC";
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    page = session.GetDataPage<TJOrderPlan>(sql, parameters.ToArray(), page);
+                }
+                return page;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "公司信息数据层-获取列表"
+                });
+                throw;
+            }
+        }
+        #endregion
+
+        #region 获取查询语句
+        /// <summary>
+        /// 获取查询语句
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <param name="parameters">参数</param>
+        /// <returns>查询语句</returns>
+        private string GetQuerySql(TJOrderPlan condition, ref List<DataParameter> parameters)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            try
+            {
+                sqlBuilder.AppendLine("	SELECT DISTINCT PID ,PLAN_NO ,PLAN_SEQ ,PLAN_STATE ,MATERIAL_CODE ,MATERIAL_NAME ,QTY,[LINENO] ,CONVERT(VARCHAR(19), PLAN_DATE, 120) AS PLAN_DATE, CREATEDATE, UPDATEDATE FROM T_PP_TJFY_ORDERPLAN	");
+                
+                //查询条件
+                if (string.IsNullOrEmpty(condition.PLAN_NO) == false)
+                {
+                    whereBuilder.Append(" AND PLAN_NO = @PLAN_NO ");
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_NO", DataType = DbType.String, Value = condition.PLAN_NO });
+                }
+                //物料号
+                if (string.IsNullOrEmpty(condition.MATERIAL_CODE) == false)
+                {
+                    whereBuilder.Append(" AND MATERIAL_CODE = @MATERIAL_CODE ");
+                    parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE });
+                }
+               
+                //计划时间
+                if (condition.PLANTIMESTART != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND PLAN_DATE >= @PLANTIMESTART");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMESTART", DataType = DbType.String, Value = condition.PLANTIMESTART });
+                }
+                if (condition.PLANTIMEEND != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND PLAN_DATE <= @PLANTIMEEND");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMEEND", DataType = DbType.String, Value = condition.PLANTIMEEND });
+                }
+
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                return sqlBuilder.ToString();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 为了修改计划顺序号用
+        /// </summary>
+        /// <param name="condition"></param>
+        /// <param name="parameters"></param>
+        /// <returns></returns>
+        private string GetQuerySqlForSeq(TJOrderPlan condition, ref List<DataParameter> parameters)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            try
+            {
+                //构成查询语句
+                sqlBuilder.AppendLine("	SELECT DISTINCT O.PID	");
+                sqlBuilder.AppendLine("	      ,O.FACTORY_CODE	");
+                sqlBuilder.AppendLine("	      ,F.FACTORY_NAME	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_NO	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_SEQ	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_STATE	");
+                sqlBuilder.AppendLine("	      ,O.MATERIAL_CODE	");
+                sqlBuilder.AppendLine("	      ,M.MATERIAL_NAME	");
+                sqlBuilder.AppendLine("	      ,O.MACHINECODDE	");
+                sqlBuilder.AppendLine("	      ,O.PBOM_CODE	");
+                sqlBuilder.AppendLine("	      ,O.ROUTE_CODE	");
+                sqlBuilder.AppendLine("	      ,R.ROUTE_NAME	");
+                sqlBuilder.AppendLine("	      ,O.REMARK	");
+                sqlBuilder.AppendLine("	      ,O.QTY	");
+                sqlBuilder.AppendLine("	      ,O.COMPLETE_QTY	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_DATE	");
+                sqlBuilder.AppendLine("	      ,O.SHIFT_CODE	");
+                sqlBuilder.AppendLine("	      ,P.PRODUCESHIFTNAME AS SHIFT_NAME	");
+                sqlBuilder.AppendLine("	      ,O.PLANSOURCE	");
+                sqlBuilder.AppendLine("	      ,O.PRODUCEREQUIRE	");
+                sqlBuilder.AppendLine("	      ,O.CREATEUSER	");
+                sqlBuilder.AppendLine("	      ,O.CREATEDATE	");
+                sqlBuilder.AppendLine("	      ,O.UPDATEUSER	");
+                sqlBuilder.AppendLine("	      ,O.UPDATEDATE	");
+                sqlBuilder.AppendLine("	      ,O.IGNORE_FISBREAK ");
+                sqlBuilder.AppendLine("	      ,O.FIS_ASMSETCODE ");
+                sqlBuilder.AppendLine("	      ,O.STARTTIME AS STARTTIMEVIEW ");
+                sqlBuilder.AppendLine("	      ,O.ENDTIME AS ENDTIMEVIEW");
+                sqlBuilder.AppendLine("	      ,C.USERNAME AS CREATEUSERNAME	");
+                sqlBuilder.AppendLine("	      ,U.USERNAME AS UPDATEUSERNAME	");
+                sqlBuilder.AppendLine("	  FROM T_PP_TJFY_ORDERPLAN O	");
+
+                //门板所需要的表T_PP_FISORDER
+                sqlBuilder.AppendLine("	  LEFT JOIN T_PP_FISWITHPLAN W ON  W.PLANID=O.PID	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_PP_FISORDER A ON  W.FISID=A.PID	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_FACTORY F ON  F.FACTORY_CODE=O.FACTORY_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_MATERIAL M ON  M.MATERIAL_CODE=O.MATERIAL_CODE	");
+
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_PBOM PB ON  PB.MATERIAL_CODE=O.MATERIAL_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_MATERIAL_ROUTE MR ON  MR.MATERIAL_CODE=PB.MATERIAL_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_PROCESS_ROUTE PR ON  PR.ROUTE_CODE=MR.ROUTE_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_PROCESS_ROUTE_WORKCELL PRW ON  PRW.ROUTE_CODE=PR.ROUTE_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_WORKCELL WC ON  WC.WORKCELL_CODE=PRW.WORKCELL_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_BD_PRODUCESHIFT P ON  P.PRODUCESHIFTTCODE=O.SHIFT_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_BD_PROCESS_ROUTE R ON  R.ROUTE_CODE=O.ROUTE_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER C ON  C.USERID=O.CREATEUSER	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER U ON U.USERID=O.UPDATEUSER	");
+
+                //whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE='{0}')", condition.ORDER_TYPE);
+
+                //查询条件
+                //if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false)
+                //{
+                //    whereBuilder.Append(" AND O.FACTORY_CODE = @FACTORY_CODE ");
+                //    parameters.Add(new DataParameter { ParameterName = "FACTORY_CODE", DataType = DbType.String, Value = condition.FACTORY_CODE });
+                //}
+                if (string.IsNullOrEmpty(condition.PLAN_NO) == false)
+                {
+                    whereBuilder.Append(" AND PLAN_NO = @PLAN_NO ");
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_NO", DataType = DbType.String, Value = condition.PLAN_NO });
+                }
+                //物料号
+                if (string.IsNullOrEmpty(condition.MATERIAL_CODE) == false)
+                {
+                    whereBuilder.Append(" AND O.MATERIAL_CODE = @MATERIAL_CODE ");
+                    parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE });
+                }
+                
+                //计划时间
+                if (condition.PLANTIMESTART != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND O.PLAN_DATE >= @PLANTIMESTART");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMESTART", DataType = DbType.String, Value = condition.PLANTIMESTART });
+                }
+                if (condition.PLANTIMEEND != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND O.PLAN_DATE <= @PLANTIMEEND");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMEEND", DataType = DbType.String, Value = condition.PLANTIMEEND });
+                }
+
+
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                return sqlBuilder.ToString();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 信息是否重复
+        /// <summary>
+        /// 判断计划单号是否存在
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns>true:已存在；fasel:不存在。</returns>
+        public int ExistsOrderPlan(TJOrderPlan model)
+        {
+            string PID = "";
+            int count = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+
+            try
+            {
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    PID = model.PID;
+                }
+                sqlBuilder.AppendLine("SELECT COUNT(*) FROM T_PP_TJFY_ORDERPLAN 	");
+                sqlBuilder.AppendLine("	WHERE PID <> @PID AND PLAN_NO=@PLAN_NO");
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(),
+                         new DataParameter("PID", PID),
+                         new DataParameter { ParameterName = "PLAN_NO", Value = model.PLAN_NO }));
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        public int Insert(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //插入基本信息
+                    count = session.Insert<TJOrderPlan>(model);
+                    InsertOrderPlanTrace(session, model, "新增");
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 更新信息
+        /// <summary>
+        /// 更新信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        public int Update(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //更新基本信息
+                    count = session.Update<TJOrderPlan>(model);
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>删除个数</returns>
+        //提交事务
+        public int Delete(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //删除基本信息
+                    count = session.Delete<TJOrderPlan>(model);
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 删除校验
+        /// <summary>
+        /// 删除校验
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int DelCheck(TJOrderPlan model)
+        {
+            int num = 0;
+            int state;
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder sqlBuilder2 = new StringBuilder();
+            sqlBuilder.AppendLine("	SELECT COMPLETE_QTY	");
+            sqlBuilder.AppendLine("	FROM T_PP_TJFY_ORDERPLAN	");
+            sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+            sqlBuilder2.AppendLine("	SELECT PLAN_STATE	");
+            sqlBuilder2.AppendLine("	FROM T_PP_TJFY_ORDERPLAN	");
+            sqlBuilder2.AppendLine("	WHERE PID = @PID 	");
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", model.PID)));
+                state = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder2.ToString(), new DataParameter("PID", model.PID)));
+            }
+            return num + state;
+
+        }
+        #endregion
+
+        #region 发布
+        /// <summary>
+        /// 发布信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>发布个数</returns>
+        public int PutOut(TJOrderPlan model, DataTable workOrderDt)
+        {
+            BaseSession = AppDataFactory.CreateMainSession();
+            IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+            IDbTransaction ids = dbConn.BeginTransaction();
+            try
+            {
+                if (workOrderDt.Rows != null)
+                {
+                    BaseSession.DbHelper.BulkCopyData(workOrderDt, "T_PP_WORKORDER", dbConn, ids);
+                    ids.Commit();
+                }
+            }
+            catch (Exception ex)
+            {
+                ids.Rollback();
+                throw ex;
+            }
+            int count = 0;
+            int count2 = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder sqlBuilder2 = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                sqlBuilder.AppendLine("	UPDATE T_PP_TJFY_ORDERPLAN	");
+                sqlBuilder.AppendLine("	SET PLAN_STATE='1'	");
+                sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+
+                sqlBuilder2.AppendLine("	UPDATE T_PP_WORKORDER	");
+                sqlBuilder2.AppendLine("	SET STATE='1'	");
+                sqlBuilder2.AppendLine("	WHERE ORDERPLANID = @PID 	");
+
+                //发布更新基本信息
+                parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = model.PID });
+                count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray());
+                count2 = session.ExecuteSql(sqlBuilder2.ToString(), parameters.ToArray());
+            }
+            return count;
+        }
+        #endregion
+
+        #region 发布校验
+        /// <summary>
+        /// 发布校验
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int PutOutCheck(TJOrderPlan model)
+        {
+            int num = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+
+            sqlBuilder.AppendLine("	SELECT PLAN_STATE	");
+            sqlBuilder.AppendLine("	FROM T_PP_TJFY_ORDERPLAN	");
+            sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", model.PID)));
+            }
+            return num;
+
+        }
+        #endregion
+
+        #region 导入
+        public ImportMessage GetImportData(List<TJOrderPlan> list)
+        {
+            ImportMessage em = new ImportMessage();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //设置祖先对象数据会话
+                    session.OpenTs();
+                    foreach (TJOrderPlan info in list)
+                    {
+                        if (info.IsNewInfo == true)
+                        {
+                            //插入信息
+                            int count = session.Insert<TJOrderPlan>(info);
+                            InsertOrderPlanTrace(session, info, "新增");
+                            em.insertNum++;
+                        }
+                        else
+                        {
+                            //更新信息
+                            int count = session.Update<TJOrderPlan>(info);
+                            InsertOrderPlanTrace(session, info, "修改");
+                            em.updateNum++;
+                        }
+                    }
+                    session.CommitTs();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return em;
+        }
+        #endregion
+
+        #region 导入校验工厂区域信息是否匹配
+        ///// <summary>
+        ///// 导入校验工厂区域信息是否匹配
+        ///// </summary>
+        ///// <param name="plantmodel">工厂</param>
+        ///// <param name="areamodel">区域</param>
+        ///// <returns>结果</returns>
+        //public int ImportCheck(Plant plantmodel, Area areamodel)
+        //{
+        //    int num = 0;
+        //    StringBuilder sqlBuilder = new StringBuilder();
+        //    try
+        //    {
+        //        sqlBuilder.AppendLine("SELECT COUNT(1) FROM T_BD_FACTORY 	");
+        //        sqlBuilder.AppendLine("	WHERE PID=@PID AND AREAID=@AREAID");
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", plantmodel.PID),
+        //                                                   new DataParameter { ParameterName = "AREAID", Value = areamodel.PID }));
+        //        }
+        //        return num;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+        #endregion
+
+        #region 获取导出的数据
+        /// <summary>
+        /// 获取导出的数据
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <returns>数据</returns>
+        public DataTable GetExportData(TJOrderPlan model)
+        {
+            DataTable dt = null;
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                //构成查询语句
+                sql = this.GetQuerySql(model, ref parameters);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    dt = session.GetTable(sql, parameters.ToArray());
+                    dt.TableName = "DoorPlankPlanExp";
+                }
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 获取流水号信息
+        /// <summary>
+        /// 获取流水号信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public int GetNum(TJOrderPlan model)
+        {
+            int num = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+            try
+            {
+                sqlBuilder.AppendLine("SELECT count(*) FROM T_PP_TJFY_ORDERPLAN 	");
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取数量信息
+                    num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString()))+1;
+                }
+                return num;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "门板信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public OrderPlanSerial GetNumSerial(TJOrderPlan model)
+        {
+            string sql = null;
+            OrderPlanSerial serial = new OrderPlanSerial();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_PP_ORDERPLANSERIAL WHERE '1'='1'";
+                //if (string.IsNullOrEmpty(model.ORDER_TYPE) == false)
+                //{
+                //    sql += " AND SERIAL_TYPE = @SERIAL_TYPE";
+                //    parameters.Add(new DataParameter("SERIAL_TYPE", model.ORDER_TYPE));
+                //}
+                if (model.PLAN_DATE != DateTime.MinValue)
+                {
+                    sql += " AND SERIAL_DATE = @SERIAL_DATE";
+                    parameters.Add(new DataParameter("SERIAL_DATE", model.PLAN_DATE.ToString("yyyyMMdd")));
+                }
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    serial = session.Get<OrderPlanSerial>(sql, parameters.ToArray());
+                }
+                return serial;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "门板信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+        /// <summary>
+        /// 更新流水号
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        //public int UpdateSerial(OrderPlanSerial model)
+        //{
+        //    int count = 0;
+        //    try
+        //    {
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            //更新基本信息
+        //            count = session.Update<OrderPlanSerial>(model);
+        //        }
+        //        return count;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        // }
+        /// <summary>
+        /// 插入信息
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        //public int InsertSerial(OrderPlanSerial model)
+        //{
+        //    int count = 0;
+        //    try
+        //    {
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            //插入基本信息
+        //            count = session.Insert<OrderPlanSerial>(model);
+        //        }
+        //        return count;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+
+        #endregion
+
+        #region 整车插入信息
+        public int InsertDoorPlan(List<TJOrderPlan> list)
+        {
+            ImportMessage em = new ImportMessage();
+            int count=0;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //设置祖先对象数据会话
+                    session.OpenTs();
+                    foreach (TJOrderPlan info in list)
+                    {
+                        count = session.Insert<TJOrderPlan>(info);
+                        InsertOrderPlanTrace(session, info, "新增");
+                    }
+                    session.CommitTs();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return count;
+        }
+        #endregion
+
+        #region 获取上一条FIS计划
+        /// <summary>
+        /// 获取上一条FIS计划
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public TJOrderPlan GetLastFIS(TJOrderPlan position)
+        {
+            StringBuilder sql = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql.AppendLine("SELECT TOP 1 * ");
+                sql.AppendLine("  FROM T_PP_TJFY_ORDERPLAN  ");
+                sql.AppendLine(" WHERE PLAN_DATE<=@plandate  ");
+                sql.AppendLine("   AND PLAN_SEQ<@planseq  ");
+                sql.AppendLine("AND (PLANSOURCE='0' OR PLANSOURCE='2') ");
+                sql.AppendLine(" ORDER BY PLAN_DATE DESC,PLAN_SEQ DESC ");
+
+                parameters.Add(new DataParameter("plandate", position.PLAN_DATE));
+                parameters.Add(new DataParameter("planseq", position.PLAN_SEQ));
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.Get<TJOrderPlan>(sql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "数据层门板计划管理-获取上一条FIS计划"
+                });
+                throw;
+            }
+            
+        }
+        #endregion 
+
+        #region 获取指定FIS计划位置存在的最大插单序号
+        /// <summary>
+        /// 获取指定FIS计划位置存在的最大插单序号
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int GetMaxFISInsertNum(TJOrderPlan model)
+        {
+            StringBuilder sql = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql.AppendLine("SELECT ISNULL(MAX(PLAN_SEQ),'0')");
+                sql.AppendLine("FROM T_PP_TJFY_ORDERPLAN ");
+                sql.AppendLine("WHERE PLAN_SEQ LIKE @planseq+'%' ");
+                sql.AppendLine("AND PLANSOURCE='2' ");
+                sql.AppendLine("AND PLAN_DATE=@plandate ");
+
+                parameters.Add(new DataParameter("plandate", model.PLAN_DATE));
+                parameters.Add(new DataParameter("planseq", model.PLAN_SEQ));
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    var maxseq= session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray()).ToString();
+                    if (string.Equals(maxseq,"0"))
+                    {
+                        return 0;
+                    }
+                    if (maxseq.Split('-').Length > 1)
+                    {
+                        return int.Parse(maxseq.Split('-')[1]);
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "数据层门板计划管理-获取上一条FIS计划"
+                });
+                throw;
+            }
+
+        }
+        #endregion 
+
+        #region 获取列表（为了修改顺序号使用）
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataPage GetDoorPlankPlanList(TJOrderPlan condition, DataPage page)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                #region 排序
+                //分页关键字段及排序
+                page.KeyName = "PID";
+                page.SortExpression = "UPDATEDATE DESC";
+                #endregion
+                sql = this.GetQuerySqlForSeq(condition, ref parameters);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    page = session.GetDataPage<TJOrderPlan>(sql, parameters.ToArray(), page);
+                }
+                return page;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取列表"
+                });
+                throw;
+            }
+        }
+        #endregion 
+
+        #region 更新计划顺序号
+        /// <summary>
+        /// 更新计划顺序号
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateSeq(TJOrderPlan model)
+        {
+            int count = 0;
+            StringBuilder sql = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+             try
+            {
+                sql.AppendLine("UPDATE T_PP_TJFY_ORDERPLAN SET PLAN_SEQ =@PLAN_SEQ WHERE PID=@PID");
+                parameters.Add(new DataParameter("PLAN_SEQ", model.PLAN_SEQ));
+                parameters.Add(new DataParameter("PID", model.PID));
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    count= session.ExecuteSql(sql.ToString(), parameters.ToArray());
+                }
+            }
+             catch (Exception ex)
+             {
+                 LogManager.LogHelper.Error(new LogInfo()
+                 {
+                     ErrorInfo = ex,
+                     Tag = ex.StackTrace,
+                     Info = "FIS 计划信息数据层-获取列表"
+                 });
+                 throw;
+             }
+             return Convert.ToInt32(count);
+
+        }
+        #endregion 
+        
+        #region 获取门板计划使用的物料号成都
+        /// <summary>
+        /// 获取门板计划使用的物料号成都
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public List<FISAssembly> GetMaterialDoorPlanForCD(FISAssembly info)
+        {
+            string sql = null;
+            List<FISAssembly> list = new List<FISAssembly>();
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sqlBuilder.AppendLine("	SELECT Id	");
+                sqlBuilder.AppendLine("	,Name	");
+                sqlBuilder.AppendLine("	,Description	");
+                sqlBuilder.AppendLine("	,CarModel	");
+                sqlBuilder.AppendLine("	,ProjectCode	");
+                sqlBuilder.AppendLine("	,BaseSet	");
+                sqlBuilder.AppendLine("	,Color	");
+                sqlBuilder.AppendLine("	,Cover	");
+                sqlBuilder.AppendLine("	,SetOption	");
+                sqlBuilder.AppendLine("	,OptionDesc1	");
+                sqlBuilder.AppendLine("	,OptionDesc2	");
+                sqlBuilder.AppendLine("	,OptionDesc3	");
+                sqlBuilder.AppendLine("	,OptionDesc4	");
+                sqlBuilder.AppendLine("	,OptionDesc5	");
+                sqlBuilder.AppendLine("	,AsmSetCode	");
+                sqlBuilder.AppendLine("	,Active	");
+                sqlBuilder.AppendLine("	,LegendColor	");
+                sqlBuilder.AppendLine("	,LegendText	");
+                sqlBuilder.AppendLine("	,ContractNo	");
+                sqlBuilder.AppendLine("	,IsDeleted	");
+                sqlBuilder.AppendLine("	,MESModulFL	");
+                sqlBuilder.AppendLine("	,MESModulFR	");
+                sqlBuilder.AppendLine("	,MESModulRL	");
+                sqlBuilder.AppendLine("	,MESModulRR	");
+                sqlBuilder.AppendLine("	      FROM [T_FIS_ASSEMBLY] AS FA	");
+                whereBuilder.Append("AND FA.[MESModulFL] IS NOT NULL	");
+                whereBuilder.Append("AND FA.[MESModulFR] IS NOT NULL	");
+                whereBuilder.Append("AND FA.[MESModulRL] IS NOT NULL	");
+                whereBuilder.Append("AND FA.[MESModulRR] IS NOT NULL	");
+                //查询条件
+
+                if (string.IsNullOrEmpty(info.Id) == false)
+                {
+                    whereBuilder.Append(" AND FA.Id = @Id ");
+                    parameters.Add(new DataParameter { ParameterName = "Id", DataType = DbType.String, Value = info.Id });
+                }
+
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                sqlBuilder.AppendLine(" ORDER BY FA.Name");
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    sql = this.ChangeSqlByDB(sqlBuilder.ToString(), session);
+                    list = session.GetList<FISAssembly>(sql, parameters.ToArray()).ToList();
+                }
+                return list;
+            }
+            catch (Exception ex)
+            {
+                RecordExceptionLog(ex, "物料号信息数据层-获取信息");
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入操作记录
+
+        public int InsertOrderPlanTrace(IDataSession Bsession, TJOrderPlan model, string operatType)
+        {
+            try
+            {
+                var sql = $" insert into T_PP_TJFY_ORDERPLANTRACE(PID,PLAN_NO,PLAN_SEQ,PLAN_STATE,MATERIAL_CODE,QTY,PLAN_DATE,CREATEDATE,CREATEUSER,OPERATE_TYPE) " +
+                    $" VALUES ('{Guid.NewGuid().ToString()}','{model.PLAN_NO}','{model.PLAN_SEQ}','{model.PLAN_STATE}','{model.MATERIAL_CODE}','{model.QTY}','{model.PLAN_DATE}','{model.UPDATEDATE}','{model.UPDATEUSER}','{operatType}');";
+                return Bsession.ExecuteSql(sql);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        #endregion
+
+        #region 查询物料名称
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <returns>全部集合</returns>
+        public string GetMATERIALNAME(string MATERIAL_CODE)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = $"select * from T_MD_MATERIAL where MATERIAL_CODE = '{MATERIAL_CODE}'";
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    var datatable = session.GetTable(sql, parameters.ToArray());
+                    if (datatable.Rows.Count > 0)
+                        return datatable.Rows[0]["MATERIAL_NAME"].ToString();
+                    else
+                        return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "物料号信息数据层-获取列表"
+                });
+                throw;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
new file mode 100644
index 0000000..e30bbeb
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
@@ -0,0 +1,1340 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.DAL;
+using QMFrameWork.Data;
+using QMAPP.FJC.Entity.FIS;
+using QMFrameWork.Log;
+using System.Data;
+using System.Collections;
+using Model;
+
+namespace QMAPP.FJC.DAL.TianJin
+{
+    /// <summary>
+    ///　模块编号：M20
+    ///　作    用：发运模块
+    ///　作    者：张松男
+    ///　编写日期：2021-12-20
+    ///</summary> 
+    public class TJFrmPlaceDAL : BaseDAL
+    {
+        /// <summary>
+        /// 获得FIS发货信息信息（列表）
+        /// </summary>
+        /// <param name="pFisOrder"></param>
+        /// <param name="pFistype"></param>
+        /// <returns></returns>
+        public DataTable GetList(string pFistype, string WORKCENTER_CODE)
+        {
+            #region
+            try
+            {
+                DataTable returnDt = null;
+                StringBuilder strSql = new StringBuilder();
+                List<DataParameter> parameters = new List<DataParameter>();
+
+                //
+                //
+
+                strSql.Append(" SELECT TOP 1000 O.PID,O.SEQ,O.MATERIAL_CODE,O.MATERIAL_NAME,O.STATE,O.[LINENO]," +
+                    "CASE O.MOULD_CODE WHEN 'LF' THEN '左前' WHEN 'LR' THEN '左后' WHEN 'RF' THEN '右前' WHEN 'RR' THEN '右后' ELSE O.MOULD_CODE END as 'MOULD_CODE'," +
+                    "O.PLAN_DATE FROM T_PP_TJFY_WORKORDER AS O LEFT JOIN T_PP_TJFY_ORDERPLAN AS P ON P.PID = O.ORDERPLANID  ");
+
+                if (!string.IsNullOrEmpty(pFistype) && pFistype == "01")
+                {
+                    strSql.Append(" WHERE  O.MOULD_CODE IN( 'LF', 'LR' )   ");
+                }
+                else
+                {
+                    strSql.Append(" WHERE  O.MOULD_CODE IN( 'RF', 'RR' )   ");
+                }
+
+                strSql.Append(" and O.STATE in ('0','1') ");
+
+                strSql.Append(" ORDER BY O.PLAN_DATE DESC,SEQ,O.MOULD_CODE ");
+
+                //strSql.Append(" SELECT TOP 1000  ");
+                //strSql.Append(" T1.PID,T1.VWSEQ,T1.PRODNO,T1.CARSETDESC_CN, T1.CP5A,T1.[LINENO], ");
+                //strSql.Append("T1.KIN,T1.VIN,T1.SCANSTATE, T2.WORKCENTER_CODE ");
+                //strSql.Append("  FROM dbo.T_PP_FISORDER  T1  ");
+                //strSql.Append("  INNER JOIN  dbo.T_PP_FISORDERSENDDETAIL T2 ");
+                //strSql.Append("  on  T1.PID=T2.FIS_PID  ");
+                //strSql.Append(" WHERE T1.scanstate=0  ");
+                //strSql.Append("  and LEFT(T1.VWSEQ,2)='" + pFistype + "' ");
+                //strSql.Append("   AND  T1.flagdel=0  ");
+
+                //if (!string.IsNullOrEmpty(WORKCENTER_CODE))
+                //{
+                //    strSql.Append("  and T2.WORKCENTER_CODE='" + WORKCENTER_CODE + "'");
+                //}
+                //strSql.Append(" ORDER BY T1.CP5A ASC,T1.VWSEQ ASC,T1.PRODNO ASC ");
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+
+                //逻辑说明
+                //FIS要货计划都有大众上线时间CP5A：201611011001表示2016年11月1号10点01分上线
+                //FIS要货计划都有一个大众顺序号VWSEQ： 018029或是029382，前两位01和02表示东厂和西厂，没有锦衣卫
+                //后面四位表示实际顺序号，所以9999台一轮回，
+                //实际出现的情况有可能出现同一个分钟上线的大众顺序号可能有两个
+                //如果出现019999和010001，实际的顺序是019999在前，010001在后，即上一个轮回的最后一条和下一个轮回的第一条
+                //如果这样前面的查询语句中就会把010001排在019999前面
+                //所以要处理这种情况。
+
+                //实现方式就是获取数据后，放到两个表中，这两个表相同，遍历第一个表，用记录和后一条记录比较，
+                //如果大众上线时间相同并且两个顺序号的差值在1000以上，一定是顺序出差，
+                //差值1000是个估计值，9999与1差值是9998，我们之前1000
+                //修改第二个表中的对应的数据
+                //极端情况出现一个大众上线时间对一个三个大众顺序号，
+                //这里一并处理
+                //if (returnDt.Rows.Count > 1)
+                //{
+
+                //    //必须进行第一次循环
+                //    bool flag = true;
+
+                //    while (flag)
+                //    {
+                //        //复制表
+                //        DataTable dt = returnDt.Copy();
+
+                //        //是否进行了值的交换标记
+                //        bool isChange = false;
+
+                //        for (int i = 0; i < dt.Rows.Count; i++)
+                //        {
+
+                //            if (i == dt.Rows.Count - 1)
+                //                continue;
+
+                //            //获取当前行对象
+                //            DataRow dr = dt.Rows[i];
+                //            string cp5aDr = dr["CP5A"].ToString();
+                //            int seqDr = Convert.ToInt32(dr["VWSEQ"].ToString().Substring(2));
+
+                //            //获取下一行对象
+                //            DataRow nextDr = dt.Rows[i + 1];
+                //            string nextCp5a = nextDr["CP5A"].ToString();
+                //            int nextSeq = Convert.ToInt32(nextDr["VWSEQ"].ToString().Substring(2));
+
+                //            //如果两行记录的大众上线时间不相同
+                //            //不需要比较
+                //            if (cp5aDr != nextCp5a)
+                //                continue;
+
+                //            //如果大众上线时间相同并且前后值大于1000，
+                //            //我们默认是
+                //            if (nextSeq - seqDr > 1000)
+                //            {
+                //                returnDt.Rows[i]["PID"] = nextDr["PID"].ToString();
+                //                returnDt.Rows[i]["VWSEQ"] = nextDr["VWSEQ"].ToString();
+                //                returnDt.Rows[i]["PRODNO"] = nextDr["PRODNO"].ToString();
+                //                returnDt.Rows[i]["CARSETDESC_CN"] = nextDr["CARSETDESC_CN"].ToString();
+                //                returnDt.Rows[i]["CP5A"] = nextDr["CP5A"].ToString();
+                //                returnDt.Rows[i]["LINENO"] = nextDr["LINENO"].ToString();
+                //                returnDt.Rows[i]["KIN"] = nextDr["KIN"].ToString();
+                //                returnDt.Rows[i]["VIN"] = nextDr["VIN"].ToString();
+                //                returnDt.Rows[i]["SCANSTATE"] = nextDr["SCANSTATE"].ToString();
+
+                //                returnDt.Rows[i + 1]["PID"] = dr["PID"].ToString();
+                //                returnDt.Rows[i + 1]["VWSEQ"] = dr["VWSEQ"].ToString();
+                //                returnDt.Rows[i + 1]["PRODNO"] = dr["PRODNO"].ToString();
+                //                returnDt.Rows[i + 1]["CARSETDESC_CN"] = dr["CARSETDESC_CN"].ToString();
+                //                returnDt.Rows[i + 1]["CP5A"] = dr["CP5A"].ToString();
+                //                returnDt.Rows[i + 1]["LINENO"] = dr["LINENO"].ToString();
+                //                returnDt.Rows[i + 1]["KIN"] = dr["KIN"].ToString();
+                //                returnDt.Rows[i + 1]["VIN"] = dr["VIN"].ToString();
+                //                returnDt.Rows[i + 1]["SCANSTATE"] = dr["SCANSTATE"].ToString();
+
+                //                //设置值的交换标记值为true
+                //                isChange = true;
+
+                //            }
+
+                //        }
+
+                //        //将是否 交换标记值付给外层标记值
+                //        //如果未进行交换，跳出while循环
+                //        //如果进行了交换就得再次循环，放在一个大众上线时间对应两个以上大众顺序号的情况
+                //        flag = isChange;
+                //    }
+                //}
+                return returnDt;
+
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+
+        public int UpdateWorkOrderState(List<string> Ids)
+        {
+            var ids = "";
+            foreach (var id in Ids)
+            {
+                ids += $"'{id}',";
+            }
+            ids = ids.TrimEnd(',');
+
+            var strSql = $" update T_PP_TJFY_WORKORDER set STATE = '4' where PID IN ({ids})";
+            
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                return session.ExecuteSql(strSql.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 贴车单记录查询
+        /// </summary>
+        /// <param name="ppastercardno"></param>
+        /// <param name="strbegindate"></param>
+        /// <param name="strenddate"></param>
+        /// <param name="vinLack"></param>
+        /// <returns></returns>
+
+        public DataTable GetPastecardInfoWithVin(string ppastercardno, string strbegindate, string strenddate, string vinLack, string PlantCode, string Operator)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            strSql.Append(@"SELECT PID,PASTECARDNO, PLANTNAME,PASTECARDDATE,PASTECARDDATE2,OPERATOR, CASE PRODUCTIONNAME WHEN '01' THEN '左侧门板发运' ELSE '右侧门板发运' END AS PRODUCTIONNAME ,CREATETIME, CASE VINLACK WHEN '1' THEN '是' ELSE '否' END AS VINLACK  FROM T_PP_PASTECARD ");
+            if (!string.IsNullOrEmpty(strbegindate) && !string.IsNullOrEmpty(strenddate))
+            {
+                strSql.Append(string.Format(" WHERE CREATETIME >='{0} 00:00:00' AND CREATETIME <= '{1} 23:59:59' ", strbegindate, strenddate));
+                if (vinLack == "1")
+                {
+                    strSql.Append(string.Format(" AND VINLACK='{0}'", vinLack));
+                }
+
+                strSql.Append(string.Format(" AND FLAGDEL='0'"));
+
+            }
+            if (!string.IsNullOrEmpty(ppastercardno))
+            {
+                strSql.Append(string.Format(" AND PASTECARDNO='{0}' ", ppastercardno));
+            }
+            if (!string.IsNullOrEmpty(PlantCode))
+            {
+                strSql.Append(string.Format(" AND PLANTNAME='{0}' ", PlantCode));
+            }
+            if (!string.IsNullOrEmpty(Operator))
+            {
+                strSql.Append(string.Format(" AND OPERATOR='{0}' ", Operator));
+            }
+
+            strSql.Append(" ORDER BY CREATETIME desc");
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+
+
+            return returnDt;
+            #endregion
+        }
+
+
+
+        /// <summary>
+        /// 根据贴车单主键查询贴车单明细
+        /// </summary>
+        /// <param name="ppastercarKey"></param>
+        /// <returns></returns>
+        public DataTable GetPasteDetails(string ppastercarKey)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            //strSql.Append(@"SELECT ROWINDEX,VWSEQ,KIN,VIN,PRODNO,CARSETDESC_CN,CP5A,[LINENO],SANBARCODE,SCANDATE,PASTECARDNO,PRODUCTIONNAME,T_PP_PASTECARD.PASTE_CARD_KEY ");
+            //strSql.Append(@"FROM T_PP_PASCARDDETAILS,T_PP_PASTECARD,T_PM_FISORDER_YB ");
+            //strSql.Append(string.Format("WHERE T_PP_PASCARDDETAILS.FIS_KEY=T_PM_FISORDER_YB.FIS_KEY AND T_PP_PASTECARD.PASTE_CARD_KEY=T_PP_PASCARDDETAILS.PASTE_CARD_KEY AND T_PP_PASCARDDETAILS.PASTE_CARD_KEY='{0}' AND T_PP_PASCARDDETAILS.FLAGDEL='0' ORDER BY ROWINDEX", ppastercarKey));
+
+            strSql.Append(@" SELECT
+                                 t1.ROWINDEX,
+                                 t3.VWSEQ,
+                                 t3.KIN,
+                                 t3.VIN,
+                                 t3.PRODNO,
+                                 t3.CARSETDESC_CN,
+                                 t3.CP5A,
+                                 t3.[LINENO],
+                                 t1.SANBARCODE,
+                                 t1.SCANDATE,
+                                 t2.PASTECARDNO,
+                                 t2.PRODUCTIONNAME,
+                                 t2.pid AS PASTE_CARD_KEY
+                                 FROM T_PP_PASCARDDETAILS t1 
+                                 inner join 
+                                 T_PP_PASTECARD t2   on  t2.PID= t1.PID
+                                 inner join 
+                                 (
+                                 SELECT *
+                                  FROM dbo.T_PP_FISORDER  T1 
+                                  INNER JOIN  dbo.T_PP_FISORDERSENDDETAIL T2
+                                 on  t1.pid=T2.FIS_PID
+                                 )t3  
+                                 on  t1.pid=t3.pid ");
+            strSql.Append(string.Format("AND T1.pid='{0}' AND t1.FLAGDEL='0' ORDER BY t1.ROWINDEX ", ppastercarKey));
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+            return returnDt;
+            #endregion
+        }
+
+        
+        /// <summary>
+        /// 根据贴车单ID获取详细
+        /// </summary>
+        /// <param name="ppastercarKey"></param>
+        /// <returns></returns>
+        public DataTable GetPascardDetailsByPid(string ppastercarKey)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            
+            strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,F.ORDERPLAN_NO as 'vin' ,F.MATERIAL_CODE as 'PRODNO' ,F.MATERIAL_NAME as 'CARSETDESC_CN' ,CASE F.MOULD_CODE WHEN 'LF' THEN '左前' WHEN 'LR' THEN '左后' WHEN 'RF' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', ");
+            strSql.AppendLine("F.[LINENO] ,C.PASTECARDNO FROM T_PP_PASCARDDETAILS AS D LEFT JOIN T_PP_TJFY_WORKORDER AS F ON F.PID = D.FISDETAILID LEFT JOIN T_PP_PASTECARD AS C ON C.PID = D.PASTECARDID ");
+            strSql.AppendLine(" WHERE PASTECARDID='" + ppastercarKey.ToString() + "' ");
+            strSql.AppendLine(" ORDER BY D.ROWINDEX,F.SEQ,F.MATERIAL_CODE");
+            
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+            return returnDt;
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 获取贴车单当天的总条数
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetPastecardNo(string strcreatetime)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            strSql.Append(@"SELECT COUNT(*)+1 FROM T_PP_PASTECARD ");
+            strSql.Append(string.Format("  WHERE CREATETIME>='{0} 00:00:00' AND CREATETIME<='{0} 23:59:59' AND FLAGDEL='0' ", strcreatetime));
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+
+            return returnDt;
+            #endregion
+        }
+
+
+
+        public int UpdatePasteCardPasteCardDate2Value(string PASTECARDNO, string PasteCarddate2, string OPERATOR)
+        {
+            try
+            {
+                StringBuilder strSql = new StringBuilder();
+                strSql.AppendFormat("  update  T_PP_PASTECARD  set PasteCarddate2='" + PasteCarddate2 + "' , OPERATOR='" + OPERATOR + "' WHERE PASTECARDNO='" + PASTECARDNO + "'");
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.ExecuteSql(strSql.ToString());
+                }
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// 获取发车信息
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetPastecardIndex(string PLANTNAME, string PASTECARDNO)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            strSql.Append(" SELECT PASTECARDNO,PASTECARDDATE,PLANTCODE,PLANTNAME FROM  T_DAS_PASTE_CARDINDEX");
+            if (PLANTNAME != "")
+            {
+                whereBuilder.Append(" AND PLANTNAME = '" + PLANTNAME + "'");
+                
+            }
+            if (PASTECARDNO != "")
+            {
+                whereBuilder.Append(" AND PASTECARDNO like '%" + PASTECARDNO + "%'");
+            }
+            if (whereBuilder.Length > 0)
+            {
+                strSql.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+            }
+
+            strSql.Append(" ORDER BY PLANTCODE ASC");
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+            return returnDt;
+            #endregion
+        }
+
+        /// <summary>
+        /// 获取贴车明细单当天的总条数
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetPastecardDeatis()
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            DataTable returnDt = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            strSql.Append(@"SELECT COUNT(*)+1 FROM T_PP_PASCARDDETAILS ");
+            strSql.Append(string.Format("  WHERE SCANDATE>='{0} 00:00:00' AND SCANDATE<='{0} 23:59:59' AND FLAGDEL='0'", DateTime.Now.ToShortDateString()));
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                returnDt = session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+
+            //return SqlHelper.QueryReturnDataTable(strSql.ToString());
+            return returnDt;
+            #endregion
+        }
+
+
+
+        /// <summary>
+        /// 获取下护板扫描表其他条码号
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetOhterCode(string code)
+        {
+            #region
+            try
+            {
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = string.Format(@"SELECT OTHERCODE,SENDED FROM  T_AW_PRODUCT WHERE SCANCODE='{0}'", code);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+
+
+
+
+
+        private string UpdateFISORDERSENDDETAIL(string FIS_PID)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("UPDATE  T_PP_FISORDERSENDDETAIL SET state='1' WHERE  FIS_PID='" + FIS_PID + "'");
+            return strSql.ToString();
+
+        }
+
+
+        /// <summary>
+        /// 生成贴车单明细SQL
+        /// </summary>
+        /// <param name="pdecard"></param>
+        /// <returns></returns>
+        private string Insertdetailcard(int rowindex, EPasteDetailsCard pdecard)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            StringBuilder strFields = new StringBuilder();
+            StringBuilder strValues = new StringBuilder();
+
+            strFields.Append(" PID ,");
+            strFields.Append(" FISDETAILID ,");
+            strFields.Append(" PASTECARDID, ");
+            strFields.Append(" SANBARCODE, ");
+            strFields.Append(" SCANDATE,");
+            strFields.Append(" ROWINDEX,");
+            strFields.Append(" FLAGDEL ");
+
+            strValues.Append("'" + pdecard.PASTEDETAILED_CARD_KEY + "',");
+            strValues.Append("'" + pdecard.FIS_KEY + "',");
+            strValues.Append("'" + pdecard.PASTE_CARD_KEY + "',");
+            strValues.Append("'" + pdecard.SANBARCODE + "',");
+            strValues.Append("'" + pdecard.SCANDATE + "',");
+            strValues.Append("'" + rowindex + "',");
+            strValues.Append("'0'");
+
+            strSql.Append(" INSERT INTO T_PP_PASCARDDETAILS ");
+            strSql.Append(" (" + strFields.ToString() + ")");
+            strSql.Append(" VALUES ");
+            strSql.Append(" (" + strValues.ToString() + ")");
+            return strSql.ToString();
+            #endregion
+        }
+
+
+
+
+
+
+
+        /// <summary>
+        /// 获取配置表中的规则类型值
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetRule(string cartype, string nf)
+        {
+            #region
+            try
+            {
+                //string nfcheck = string.Format(@"SELECT COUNT(*) FROM T_DCS_FISCHECKRULE WHERE CARTYPE='{0}' AND BINDINGTYPE = '{1}'", cartype, nf);
+                //int count = (int)SqlHelper.GetSingle(nfcheck);
+
+                //if (count > 0)
+                //{
+                //    string strSql = string.Format(@"SELECT BINDINGTYPE, BINDINGVALUE AS OTHERCODE FROM T_DCS_FISCHECKRULE WHERE CARTYPE='{0}' AND BINDINGTYPE <>'下护板'", cartype);
+
+                //    return SqlHelper.QueryReturnDataTable(strSql.ToString());
+                //}
+                //return null;
+                DataTable dt = new DataTable();
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = string.Format(@"SELECT BINDINGTYPE, BINDINGVALUE AS OTHERCODE FROM T_DCS_FISCHECKRULE WHERE CARTYPE='{0}'", cartype);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    dt = session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+
+                return dt;
+
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+
+
+        /// <summary>
+        /// 根据条码标识查询零件信息
+        /// </summary>
+        /// <param name="strbarcode"></param>
+        /// <returns></returns>
+        public DataTable GetSparepartsinfo(string strbarcode)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            strSql.Append(@"SELECT CUSTOMERSPAREPARTS,BARCODEIDENTIFICATION,VEHICLETYPE,CODENAME FROM T_DAS_SPAREPARTS_INFO ,T_QM_CODE ");
+            strSql.Append(@"WHERE T_DAS_SPAREPARTS_INFO.VEHICLETYPE= T_QM_CODE.CODENUM AND  T_QM_CODE.CODE='101' ");
+            strSql.Append(string.Format("  AND T_DAS_SPAREPARTS_INFO.FLAGDEL='0' AND  BARCODEIDENTIFICATION='{0}'  ", strbarcode));
+
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                //dt = session.GetTable(strSql.ToString(), parameters.ToArray());
+                return session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+            #endregion
+        }
+
+
+
+
+
+
+        /// <summary>
+        /// 实现校准功能
+        /// </summary>
+        /// <param name="strvwseq"></param>
+        public void UpdateFisOrder(string strvwseq, string strCP5A, string workcenter)
+        {
+            #region
+
+            StringBuilder strSql = new StringBuilder();
+            StringBuilder strSql2 = new StringBuilder();
+
+            //增加更新数据的条件： LEFT(VWSEQ,2)='{0}' AND ，需按单线或混线更新数据。MODIFIED BY SUUN GQ ON 20130330.
+            //            StringBuilder deleteSql = new StringBuilder();
+
+            //            // strSql.Append(string.Format(@"UPDATE T_PP_FISORDERSENDDETAIL SET SCANSTATE=2 WHERE LEFT(VWSEQ,2)='{0}' AND CP5A <= '{1}' AND SCANSTATE=0 AND FLAGDEL='0'", strvwseq.Substring(0, 2), strCP5A));
+            //            strSql.Append(string.Format(@"update  T_PP_FISORDERSENDDETAIL set STATE='2' where FIS_PID in ( 
+            //            select PID from   T_PP_FISORDER where   LEFT(VWSEQ,2)='{0}' AND CP5A <= '{1}' AND SCANSTATE=0 AND FLAGDEL='0'  )", strvwseq.Substring(0, 2), strCP5A));
+
+            //            strSql2.Append(string.Format(@" UPDATE dbo.T_PP_FISORDER 
+            //                                               SET SCANSTATE=(SELECT  MIN(STATE) AS  STATE  FROM dbo.T_PP_FISORDERSENDDETAIL WHERE FIS_pid in (SELECT pid from T_PP_FISORDER  WHERE   LEFT(VWSEQ,2)='{0}' AND CP5A <= '{1}' AND SCANSTATE=0 AND FLAGDEL='0'  )    ) 
+            //                                                WHERE   LEFT(VWSEQ,2)='{0}' AND CP5A <= '{1}' AND SCANSTATE=0 AND FLAGDEL='0' ", strvwseq.Substring(0, 2), strCP5A));
+
+            //deleteSql.Append(string.Format(@"delete from  T_PP_FISORDER WHERE LEFT(VWSEQ,2)='{0}' AND CP5A <= '{1}' AND SCANSTATE=0 AND FLAGDEL='0'", strvwseq.Substring(0, 2), strCP5A));
+
+            strSql.AppendLine("UPDATE T_PP_FISORDERSENDDETAIL ");
+            strSql.AppendLine("SET STATE=3  ");
+            strSql.AppendLine("WHERE FIS_PID IN(SELECT F.PID ");
+            strSql.AppendLine("			   FROM T_PP_FISORDER AS F ");
+            strSql.AppendLine("			   LEFT JOIN T_PP_FISORDERSENDDETAIL AS D ");
+            strSql.AppendLine("			     ON D.FIS_PID=F.PID  ");
+            strSql.AppendFormat("			  WHERE F.CP5A<='{0}'", strCP5A);
+            strSql.AppendFormat("			    AND D.WORKCENTER_CODE='{0}'", workcenter);
+            strSql.AppendLine("				AND F.SCANSTATE='0') ");
+
+            strSql2.AppendLine("UPDATE T_PP_FISORDER ");
+            strSql2.AppendLine("SET SCANSTATE=3 ");
+            strSql2.AppendLine("WHERE PID IN(SELECT F.PID");
+            strSql2.AppendLine("			   FROM T_PP_FISORDER AS F");
+            strSql2.AppendLine("			   LEFT JOIN T_PP_FISORDERSENDDETAIL AS D");
+            strSql2.AppendLine("			     ON D.FIS_PID=F.PID ");
+            strSql2.AppendFormat("			  WHERE F.CP5A<='{0}'", strCP5A);
+            strSql2.AppendFormat("			    AND D.WORKCENTER_CODE='{0}'", workcenter);
+            strSql2.AppendLine("				AND F.SCANSTATE='0')");
+
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                session.ExecuteSql(strSql.ToString());
+                session.ExecuteSql(strSql2.ToString());
+                //session.ExecuteSql(deleteSql.ToString());
+            }
+            //SqlHelper.ExecuteSqlTran(sqlList);
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 更新FIS队列表。
+        /// </summary>
+        /// <returns></returns>
+        private string updateFisOrder(string pfiskey,string PRODUCTCODE)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append(string.Format($" UPDATE T_PP_TJFY_WORKORDER SET STATE =2,PRODUCTCODE = '{PRODUCTCODE}' WHERE PID= '{pfiskey}' "));
+
+            return strSql.ToString();
+            #endregion
+        }
+
+        private string updateProduct(string product_pid)
+        {
+            #region
+            StringBuilder strSql = new StringBuilder();
+
+
+            strSql.Append(string.Format(@" UPDATE t_aw_product 
+                                   SET OUTFLAG='1'
+                                    WHERE  PID='{0}' ", product_pid));
+
+            return strSql.ToString();
+            #endregion
+        }
+
+        private string updateProduct(string product_pid, string vin, string kin, string seq)
+        {
+            #region
+
+            StringBuilder strSql = new StringBuilder();
+            string vin_rev = "";
+            if (!string.IsNullOrWhiteSpace(vin))
+            {
+                vin_rev = new string(vin.Reverse().ToArray());
+            }
+
+            strSql.Append(string.Format(@" UPDATE t_aw_product 
+                                   SET OUTFLAG='1',VIN='{1}',VIN_REV='{4}',KIN='{2}',VWSEQ='{3}'
+                                    WHERE  PID='{0}' ", product_pid, vin, kin, seq, vin_rev));
+
+            return strSql.ToString();
+
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 删除FIS发运表
+        /// </summary>
+        /// <param name="pfiskey"></param>
+        /// <returns></returns>
+        private string DeleteSPFisOrder(string pfiskey)
+        {
+            #region
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append(string.Format(" delete from  T_PP_FISORDER  WHERE PID= '{0}' AND FLAGDEL='0' ", pfiskey));
+            return strSql.ToString();
+            #endregion
+        }
+
+
+        public string UpdateScan(string scancode)
+        {
+            #region
+            try
+            {
+                string strSql = string.Format(@"UPDATE  T_AW_PRODUCT SET SENDED='1' WHERE SCANCODE='{0}'", scancode);
+
+                return strSql;
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+        /// <summary>
+        /// 添加贴车单
+        /// </summary>
+        /// <param name="ppastecard"></param>
+        /// <param name="pDetailsCard"></param>
+        /// <returns></returns>
+        public int AddPasteCard(EPasteCard ppastecard)
+        {
+            #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;
+                if (tbl != null)
+                {
+                    strindex = int.Parse(tbl.Rows[0][0].ToString());
+                    reindex = strindex;
+                }
+                ArrayList sqllist = new ArrayList();
+                StringBuilder strSql = new StringBuilder();
+                StringBuilder strFields = new StringBuilder();
+                StringBuilder strValues = new StringBuilder();
+                strFields.Append(" PID ,");
+                strFields.Append(" PASTECARDNO ,");
+                strFields.Append(" PASTECARDDATE, ");
+                strFields.Append(" PASTECARDDATE2, ");
+                strFields.Append(" OPERATOR, ");
+                strFields.Append(" PRODUCTIONNAME, ");
+                strFields.Append(" CREATETIME, ");
+                strFields.Append(" VINLACK, ");
+                strFields.Append(" FLAGDEL, ");
+                strFields.Append(" PLANTNAME ");
+
+                //strValues.Append(" '" + pLog.LOGDATE + "',");                
+                strValues.Append("'" + ppastecard.PASTE_CARD_KEY + "',");
+                strValues.Append("'" + ppastecard.PASTECARDNO + "',");
+                strValues.Append("'" + ppastecard.PASTECARDDATE + "',");
+                strValues.Append("'" + ppastecard.PASTECARDDATE2 + "',");
+                strValues.Append("'" + ppastecard.OPERATOR + "',");
+                strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',");
+                strValues.Append("'" + ppastecard.CREATETIME + "',");
+                strValues.Append("'" + ppastecard.VINLACK + "',");
+                strValues.Append("'0',");
+                //strValues.Append("'" + ppastecard.PLANTNAME + "'");
+
+                strSql.Append(" INSERT INTO T_PP_PASTECARD ");
+                strSql.Append(" (" + strFields.ToString() + ")");
+                strSql.Append(" VALUES ");
+                strSql.Append(" (" + strValues.ToString() + ")");
+
+
+                StringBuilder strSqllog = new StringBuilder();
+                StringBuilder strFieldslog = new StringBuilder();
+                StringBuilder strValueslog = new StringBuilder();
+                strFieldslog.Append(" TID ,");
+                strFieldslog.Append(" FCT_OPERTYPE ,");
+                strFieldslog.Append(" FCT_NO, ");
+                strFieldslog.Append(" FCT_REASON, ");
+                strFieldslog.Append(" FCT_DATE, ");
+                strFieldslog.Append(" FCT_OPER, ");
+                strFieldslog.Append(" FLAGDEL ");
+
+                //strValues.Append(" '" + pLog.LOGDATE + "',");                
+                strValueslog.Append("'" + ppastecard.FailLog.TID + "',");
+                strValueslog.Append("'" + ppastecard.FailLog.FCT_OPERTYPE + "',");
+                strValueslog.Append("'" + ppastecard.FailLog.FCT_NO + "',");
+                strValueslog.Append("'" + ppastecard.FailLog.FCT_REASON + "',");
+                strValueslog.Append("'" + ppastecard.FailLog.FCT_DATE + "',");
+                strValueslog.Append("'" + ppastecard.FailLog.FCT_OPER + "',");
+                strValueslog.Append("'0'");
+
+                strSqllog.Append(" INSERT INTO T_DAS_FAILCODE ");
+                strSqllog.Append(" (" + strFieldslog.ToString() + ")");
+                strSqllog.Append(" VALUES ");
+                strSqllog.Append(" (" + strValueslog.ToString() + ")");
+
+                sqllist.Add(strSqllog.ToString());
+                sqllist.Add(strSql.ToString());
+                foreach (EPasteDetailsCard decard in ppastecard.DetailsCardlist)
+                {
+                    int rowindex = strindex;
+                    string strinsertsql = Insertdetailcard(rowindex, decard);
+                    string updatesql = updateFisOrder(decard.FIS_KEY, decard.SANBARCODE);
+                    string deleteSql = DeleteSPFisOrder(decard.FIS_KEY);
+
+
+                    sqllist.Add(strinsertsql);
+
+                    //更新FIS原表T_PM_FISORDER_YB
+                    sqllist.Add(updatesql);
+
+                    //删除FIS发货表T_PP_FISORDER(错误)(瞎说)
+                    //DCS系统存储FIS要货信息时存了两张表，MES只存了一张
+                    //sqllist.Add(deleteSql);
+
+                    //2016-9-13 闫永刚更新
+                    if (decard.SANBARCODE.Substring(0, 2) == "xxxxx")
+                    {
+                        string updateScanBarCodesql = UpdateScan(decard.SANBARCODE);
+                        sqllist.Add(updateScanBarCodesql);
+                    }
+
+
+                    strindex++;
+                }
+
+                //2016-10-31 闫永刚 
+                //更新发货单记录表
+                sqllist.Add(string.Format("update  T_DAS_PASTE_CARDINDEX set PASTECARDNO='{0}',PASTECARDDATE='{1}' where PLANTNAME='{2}'", ppastecard.PASTECARDNO, System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ""));
+
+                for (var i = 0; i < sqllist.Count; i++)
+                {
+                    using (IDataSession session = AppDataFactory.CreateMainSession())
+                    {
+                        session.ExecuteSql(sqllist[i].ToString());
+                    }
+
+                }
+                // SqlHelper.ExecuteSqlTran(sqllist);
+                return reindex;
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+
+
+
+        /// <summary>
+        /// 添加贴车单
+        /// </summary>
+        /// <param name="ppastecard"></param>
+        /// <param name="pDetailsCard"></param>
+        /// <returns></returns>
+        public int AddNewPasteCard(EPasteCard ppastecard,int Count)
+        {
+            try
+            {
+                #region 获取贴车单序列号
+
+                string indexNumber = string.Format("select PASTECARDNO from T_DAS_PASTE_CARDINDEX where PLANTCODE='{0}'", ppastecard.PLANTNAME);
+
+                string pastCardNo = "";
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    pastCardNo = Convert.ToString(session.ExecuteSqlScalar(indexNumber, new List<DataParameter>().ToArray()));
+                }
+
+                //if (pastCardNo.Substring(ppastecard.PLANTNAME.Length, 8)
+                //    == System.DateTime.Now.ToString("yyyyMMdd"))
+                //{
+                //    int numberIndex = Convert.ToInt32(pastCardNo.Substring(ppastecard.PLANTNAME.Length + 8, 4));
+                //    pastCardNo = pastCardNo.Substring(0, ppastecard.PLANTNAME.Length + 8) + (numberIndex + 1).ToString().PadLeft(4, '0');
+                //}
+                //else
+                //{
+                //    pastCardNo = pastCardNo.Substring(0, ppastecard.PLANTNAME.Length) + System.DateTime.Now.ToString("yyyyMMdd") + "0001";
+                //}
+
+                #endregion
+                
+                if (ppastecard.DetailsCardlist.Count == 1)
+                {
+                    ppastecard.VINLACK = "0";
+                }
+                else
+                {
+                    if (ppastecard.DetailsCardlist.Count == Count)
+                    {
+                        ppastecard.VINLACK = "0";
+                    }
+                    else
+                    {
+                        ppastecard.VINLACK = "1";
+                    }
+                }
+
+                DataTable tbl = GetPastecardDeatis();
+                int strindex = 0;
+                int reindex = 0;
+                if (tbl != null)
+                {
+                    strindex = int.Parse(tbl.Rows[0][0].ToString());
+                    reindex = strindex;
+                }
+
+
+
+                ArrayList sqllist = new ArrayList();
+                StringBuilder strSql = new StringBuilder();
+                StringBuilder strFields = new StringBuilder();
+                StringBuilder strValues = new StringBuilder();
+                strFields.Append(" PID ,");
+                strFields.Append(" PASTECARDNO ,");
+                strFields.Append(" PASTECARDDATE, ");
+                strFields.Append(" PASTECARDDATE2, ");
+                strFields.Append(" OPERATOR, ");
+                strFields.Append(" PRODUCTIONNAME, ");
+                strFields.Append(" CREATETIME, ");
+                strFields.Append(" VINLACK, ");
+                strFields.Append(" FLAGDEL, ");
+                strFields.Append(" PLANTNAME ");
+
+
+                strValues.Append("'" + ppastecard.PASTE_CARD_KEY + "',");
+                strValues.Append("'" + ppastecard.PASTECARDNO + "',");
+                strValues.Append("'" + ppastecard.PASTECARDDATE + "',");
+                strValues.Append("'" + ppastecard.PASTECARDDATE2 + "',");
+                strValues.Append("'" + ppastecard.OPERATOR + "',");
+                strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',");
+                ppastecard.CREATETIME = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                strValues.Append("'" + ppastecard.CREATETIME + "',");
+                strValues.Append("'" + ppastecard.VINLACK + "',");
+                strValues.Append($"'0','{ppastecard.PLANTNAME}'");
+               
+                strSql.Append(" INSERT INTO T_PP_PASTECARD ");
+                strSql.Append(" (" + strFields.ToString() + ")");
+                strSql.Append(" VALUES ");
+                strSql.Append(" (" + strValues.ToString() + ")");
+
+                sqllist.Add(strSql.ToString());
+
+                foreach (EPasteDetailsCard decard in ppastecard.DetailsCardlist)
+                {
+                    int rowindex = strindex;
+                    string strinsertsql = Insertdetailcard(rowindex, decard);
+                    //string updatesql = UpdateFISORDERSENDDETAIL(decard.FIS_KEY);
+                    string updatesql2 = updateFisOrder(decard.FIS_KEY, decard.SANBARCODE);
+                    //string updatesql3 = updateProduct(decard.PRODUCT_PID, decard.VIN, decard.KIN, decard.VWSEQ);
+                    sqllist.Add(strinsertsql.ToString());
+                    //sqllist.Add(updatesql.ToString());
+                    sqllist.Add(updatesql2.ToString());
+                    //sqllist.Add(updatesql3.ToString());
+                    strindex++;
+                }
+
+                //2016-10-31 闫永刚 
+                //更新发货单记录表
+                sqllist.Add(string.Format("update  T_DAS_PASTE_CARDINDEX set PASTECARDNO='{0}',PASTECARDDATE='{1}' where PLANTCODE='{2}'", pastCardNo, System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), ppastecard.PLANTNAME));
+
+
+                for (var i = 0; i < sqllist.Count; i++)
+                {
+                    using (IDataSession session = AppDataFactory.CreateMainSession())
+                    {
+                        session.ExecuteSql(sqllist[i].ToString());
+                    }
+
+                }
+                return reindex;
+
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+
+
+
+        /// <summary>
+        /// 更新贴车单信息
+        /// </summary>
+        /// <param name="UpdatePastecardIndex"></param>
+        /// <param name="dt"></param>
+        public int UpdatePastecardIndex(string UpdatePastecardIndex, System.DateTime dt, string Plantname)
+        {
+            #region
+            try
+            {
+                StringBuilder strSql = new StringBuilder();
+                strSql.AppendFormat(" update  T_DAS_PASTE_CARDINDEX set PASTECARDNO='{0}',PASTECARDDATE='{1}' where plantname='{2}'", UpdatePastecardIndex, dt.ToString("yyyy-MM-dd HH:mm:ss"), Plantname);
+                //SqlHelper.ExecuteSql(strSql.ToString());
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.ExecuteSql(strSql.ToString());
+                }
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+            #endregion
+        }
+
+
+
+
+        /// <summary>
+        /// 判断条码是否重复
+        /// </summary>
+        /// <param name="barcodetime"></param>
+        /// <returns></returns>
+        public DataTable ExistBarcode(int barcodetime, string pbarcode)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append($"SELECT PRODUCTCODE FROM T_PP_TJFY_WORKORDER WHERE PRODUCTCODE = '{pbarcode}'");
+            List<DataParameter> parameters = new List<DataParameter>();
+            //DateTime dtime = DateTime.Now;
+            //string bdatetime = dtime.AddDays(-barcodetime).ToShortDateString();
+            //strSql.Append(string.Format("  WHERE SANBARCODE='{2}' AND SCANDATE>='{0} 00:00:00' and SCANDATE<='{1} 23:59:59' AND  FLAGDEL='0' ", bdatetime, DateTime.Now.ToShortDateString(), pbarcode));
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                return session.GetTable(strSql.ToString(), parameters.ToArray());
+            }
+        }
+
+        /// <summary>
+        /// 打印条码
+        /// </summary>
+        /// <param name="barcodetime"></param>
+        /// <returns></returns>
+        public DataTable WriteFile(string sql)
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                return session.GetTable(sql.ToString(), parameters.ToArray());
+            }
+
+        }
+
+
+        /// <summary>
+        /// 更新贴车单补打印时间
+        /// </summary>
+        /// <param name="pastecardno"></param>
+        public void UpdataBarcodeDate(string pastecardno)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append(string.Format("UPDATE T_PP_PASTECARD SET PASTECARDDATE2='{0}' WHERE PASTECARDNO='{1}'", DateTime.Now.ToString(), pastecardno));
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                session.ExecuteSql(strSql.ToString());
+            }
+
+
+
+        }
+
+
+        public void InsertLog(EFailLog plog)
+        {
+            StringBuilder strSqllog = new StringBuilder();
+            StringBuilder strFieldslog = new StringBuilder();
+            StringBuilder strValueslog = new StringBuilder();
+            strFieldslog.Append(" TID ,");
+            strFieldslog.Append(" FCT_OPERTYPE ,");
+            strFieldslog.Append(" FCT_NO, ");
+            strFieldslog.Append(" FCT_REASON, ");
+            strFieldslog.Append(" FCT_DATE, ");
+            strFieldslog.Append(" FCT_OPER, ");
+            strFieldslog.Append(" FLAGDEL ");
+
+            //strValues.Append(" '" + pLog.LOGDATE + "',");                
+            strValueslog.Append("'" + plog.TID + "',");
+            strValueslog.Append("'" + plog.FCT_OPERTYPE + "',");
+            strValueslog.Append("'" + plog.FCT_NO + "',");
+            strValueslog.Append("'" + plog.FCT_REASON + "',");
+            strValueslog.Append("'" + plog.FCT_DATE + "',");
+            strValueslog.Append("'" + plog.FCT_OPER + "',");
+            strValueslog.Append("'0'");
+
+            strSqllog.Append(" INSERT INTO T_DAS_FAILCODE ");
+            strSqllog.Append(" (" + strFieldslog.ToString() + ")");
+            strSqllog.Append(" VALUES ");
+            strSqllog.Append(" (" + strValueslog.ToString() + ")");
+
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                session.ExecuteSql(strSqllog.ToString());
+
+            }
+
+        }
+
+
+
+
+
+        /// <summary>
+        /// 获取扫取条形码是否存在
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public int GetExitsCode(string code)
+        {
+            #region
+            try
+            {
+                object result;
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = string.Format(@"SELECT  count(1) as NUM  FROM  dbo.T_AW_PRODUCT where PRODUCTCODE='{0}'", code);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    result = session.ExecuteSqlScalar(strSql.ToString(), parameters.ToArray());
+                }
+                return Convert.ToInt32(result);
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+        /// <summary>
+        /// 查询是否为成品
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public object GetExitsStatus(string code)
+        {
+            #region
+            try
+            {
+                object result;
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = string.Format(@"SELECT  Status   FROM  dbo.T_AW_PRODUCT where PRODUCTCODE='{0}'", code);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    result = session.ExecuteSqlScalar(strSql.ToString(), parameters.ToArray());
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 获取工作中心
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetWORKCENTERCODE()
+        {
+
+            #region
+            try
+            {
+                DataTable result;
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = "SELECT [WORKCENTER_CODE],[WORKCENTER_NAME] FROM [T_MD_WORKCENTER] WHERE CENTER_TYPE='1'";
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    result = session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+
+        ///// <summary>
+        ///// 更新index表
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <returns></returns>
+        //public DataTable GetWORKCENTERCODE()
+        //{
+
+        //    #region
+        //    try
+        //    {
+        //        DataTable result;
+        //        List<DataParameter> parameters = new List<DataParameter>();
+        //        string strSql = "select WORKCENTER_CODE from  dbo.T_PP_FISORDERSENDDETAIL group by WORKCENTER_CODE";
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            result = session.GetTable(strSql.ToString(), parameters.ToArray());
+        //        }
+        //        return result;
+        //    }
+        //    catch (Exception ex)
+        //    {
+
+        //        throw ex;
+        //    }
+        //    #endregion
+        //}
+
+        /// <summary>
+        /// 获取 DASPASTECARDINDEX表数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public DataTable GetDaspssteCarIndexByPlanName(string PlanTName)
+        {
+
+            #region
+            try
+            {
+                DataTable result;
+                List<DataParameter> parameters = new List<DataParameter>();
+                string strSql = "select  PASTECARDNO,PASTECARDDATE,PLANTCODE, PLANTNAME from T_DAS_PASTE_CARDINDEX  where PLANTCODE='" + PlanTName + "'";
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    result = session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+                return result;
+            }
+
+
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+            #endregion
+        }
+
+
+
+
+        /// <summary>
+        /// 插入 DASPASTECARDINDEX表数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public int InsertDaspssteCarIndexByPlanName(EPasteCard ppastecard)
+        {
+            try
+            {
+                int result;
+                List<DataParameter> parameters = new List<DataParameter>();
+
+                StringBuilder strSql = new StringBuilder();
+                StringBuilder strFields = new StringBuilder();
+                StringBuilder strValues = new StringBuilder();
+                strFields.Append(" PID ,");
+                strFields.Append(" PASTECARDNO ,");
+                strFields.Append(" PASTECARDDATE, ");
+                strFields.Append(" PLANTCODE, ");
+                strFields.Append(" PLANTNAME ");
+
+                strValues.Append("'" + ppastecard.PASTE_CARD_KEY + "',");
+                strValues.Append("'" + ppastecard.PASTECARDNO + "',");
+                strValues.Append("'" + ppastecard.PASTECARDDATE + "',");
+
+                strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',");
+                //strValues.Append("'" + ppastecard.PLANTNAME + "'");
+
+                strSql.Append(" INSERT INTO T_DAS_PASTE_CARDINDEX ");
+                strSql.Append(" (" + strFields.ToString() + ")");
+                strSql.Append(" VALUES ");
+                strSql.Append(" (" + strValues.ToString() + ")");
+
+
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    result = session.ExecuteSql(strSql.ToString(), parameters.ToArray());
+                }
+
+                return result;
+
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+
+        }
+
+
+
+
+        public DataTable GetLastPastCard()
+        {
+            try
+            {
+                #region
+                DataTable result;
+                StringBuilder strSql = new StringBuilder();
+                List<DataParameter> parameters = new List<DataParameter>();
+                strSql.Append(@"SELECT [TIMEOUT_KEY] ,[TIMEOUT_TYPE],[TIMEOUT_VALUE],[FLAGDEL]  FROM [T_DCS_TIMEOUT_SET] ");
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                   result = session.GetTable(strSql.ToString(), parameters.ToArray());
+                }
+                return result;
+                #endregion
+            }
+            catch (System.Exception ex)
+            {
+                throw ex;
+            }
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJOrderPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJOrderPlanDAL.cs
new file mode 100644
index 0000000..ae29b64
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJOrderPlanDAL.cs
@@ -0,0 +1,989 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.FJC.Entity.FIS;
+using QMFrameWork.Data;
+using QMFrameWork.Log;
+using System.Data;
+using QMAPP.Entity;
+using QMAPP.DAL;
+using QMAPP.FJC.Entity.TianJin;
+//using QMAPP.FJC.Entity.FileCopy.FIS;
+
+namespace QMAPP.FJC.DAL.TianJin
+{
+    /// <summary>
+    /// 注塑计划管理
+    /// 
+    /// 
+    /// </summary>
+    public class TJOrderPlanDAL : BaseDAL
+    {
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public TJOrderPlan Get(TJOrderPlan model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_PP_TJFY_ORDERPLAN WHERE 1=1 ";
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    sql += " AND PID = @PID";
+                    parameters.Add(new DataParameter("PID", model.PID));
+                }
+                if (string.IsNullOrEmpty(model.PLAN_NO) == false)
+                {
+                    sql += " AND PLAN_NO = @PLAN_NO";
+                    parameters.Add(new DataParameter("PLAN_NO", model.PLAN_NO));
+                }
+                //if (string.IsNullOrEmpty(model.MACHINECODDE) == false)
+                //{
+                //    sql += " AND MACHINECODDE = @MACHINECODDE";
+                //    parameters.Add(new DataParameter("MACHINECODDE", model.MACHINECODDE));
+                //}
+                if (string.IsNullOrEmpty(model.MATERIAL_CODE) == false)
+                {
+                    sql += " AND MATERIAL_CODE = @MATERIAL_CODE";
+                    parameters.Add(new DataParameter("MATERIAL_CODE", model.MATERIAL_CODE));
+                }
+                if (string.IsNullOrEmpty(model.PLAN_STATES) == false)
+                {
+                    sql += " AND PLAN_STATE IN ('" + model.PLAN_STATES.Replace(",", "','") + "')";
+
+                }
+                if (BaseSession != null)
+                {
+                    //获取信息
+                    model = BaseSession.Get<TJOrderPlan>(sql, parameters.ToArray());
+                }
+                else
+                {
+                    using (IDataSession session = AppDataFactory.CreateMainSession())
+                    {
+                        //获取信息
+                        model = session.Get<TJOrderPlan>(sql, parameters.ToArray());
+                    }
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+
+        public TJOrderPlan GetOne(TJOrderPlan model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_PP_ORDERPLAN WHERE PLAN_STATE IN ('1','2') ";
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    sql += " AND PID = @PID";
+                    parameters.Add(new DataParameter("PID", model.PID));
+                }
+                if (string.IsNullOrEmpty(model.PLAN_NO) == false)
+                {
+                    sql += " AND PLAN_NO = @PLAN_NO";
+                    parameters.Add(new DataParameter("PLAN_NO", model.PLAN_NO));
+                }
+                //if (string.IsNullOrEmpty(model.MACHINECODDE) == false)
+                //{
+                //    sql += " AND MACHINECODDE = @MACHINECODDE";
+                //    parameters.Add(new DataParameter("MACHINECODDE", model.MACHINECODDE));
+                //}
+                if (string.IsNullOrEmpty(model.MATERIAL_CODE) == false)
+                {
+                    sql += " AND MATERIAL_CODE = @MATERIAL_CODE";
+                    parameters.Add(new DataParameter("MATERIAL_CODE", model.MATERIAL_CODE));
+                }
+
+                sql += " order by CREATEDATE desc ";
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    model = session.Get<TJOrderPlan>(sql, parameters.ToArray());
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+
+        public TJOrderPlan GetInfo(TJOrderPlan model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_PP_ORDERPLAN  WHERE PLAN_NO = @PLAN_NO";
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_NO", DataType = DbType.String, Value = model.PLAN_NO });
+                    model = session.Get<TJOrderPlan>(sql, parameters.ToArray());
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataPage GetList(TJOrderPlan condition, DataPage page)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = this.GetQuerySql(condition, ref parameters);
+                //分页关键字段及排序
+                page.KeyName = "PID";
+                if (string.IsNullOrEmpty(page.SortExpression))
+                {
+                    page.SortExpression = "CREATEDATE DESC";
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    page = session.GetDataPage<TJOrderPlan>(sql, parameters.ToArray(), page);
+                }
+                return page;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "注塑信息数据层-获取列表"
+                });
+                throw;
+            }
+        }
+        #endregion
+
+        #region 获取查询语句
+        /// <summary>
+        /// 获取查询语句
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <param name="parameters">参数</param>
+        /// <returns>查询语句</returns>
+        private string GetQuerySql(TJOrderPlan condition, ref List<DataParameter> parameters)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            try
+            {
+                //构成查询语句
+                sqlBuilder.AppendLine("	SELECT DISTINCT O.PID	");
+                sqlBuilder.AppendLine("	      ,O.FACTORY_CODE	");
+                sqlBuilder.AppendLine("	      ,F.FACTORY_NAME	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_NO	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_SEQ	");
+                sqlBuilder.AppendLine("	      ,O.PLAN_STATE	");
+                sqlBuilder.AppendLine("	      ,O.MATERIAL_CODE	");
+                sqlBuilder.AppendLine("	      ,M.MATERIAL_NAME	");
+                sqlBuilder.AppendLine("	      ,O.MACHINECODDE	");
+                sqlBuilder.AppendLine("	      ,O.PBOM_CODE	");
+                sqlBuilder.AppendLine("	      ,O.ROUTE_CODE	");
+                sqlBuilder.AppendLine("	      ,O.REMARK	");
+                sqlBuilder.AppendLine("	      ,O.QTY	");
+                sqlBuilder.AppendLine("	      ,O.COMPLETE_QTY	");
+                sqlBuilder.AppendLine("	      ,CONVERT(VARCHAR(19),O.PLAN_DATE,120) AS PLAN_DATE	");
+                sqlBuilder.AppendLine("	      ,O.SHIFT_CODE	");
+                sqlBuilder.AppendLine("	      ,P.PRODUCESHIFTNAME AS SHIFT_NAME	");
+                sqlBuilder.AppendLine("	      ,O.PLANSOURCE	");
+                sqlBuilder.AppendLine("	      ,O.PRODUCEREQUIRE	");
+                //sqlBuilder.AppendLine("	      ,WC.WORKCENTER_CODE	");
+                sqlBuilder.AppendLine("	      ,O.CREATEUSER	");
+                sqlBuilder.AppendLine("	      ,O.CREATEDATE	");
+                sqlBuilder.AppendLine("	      ,O.UPDATEUSER	");
+                sqlBuilder.AppendLine("	      ,O.UPDATEDATE	");
+                sqlBuilder.AppendLine("	      ,O.IGNORE_FISBREAK ");
+                sqlBuilder.AppendLine("	      ,O.FIS_ASMSETCODE ");
+                sqlBuilder.AppendLine("	      ,O.STARTTIME AS STARTTIMEVIEW ");
+                sqlBuilder.AppendLine("	      ,O.ENDTIME AS ENDTIMEVIEW");
+                sqlBuilder.AppendLine("	      ,C.USERNAME AS CREATEUSERNAME	");
+                sqlBuilder.AppendLine("	      ,U.USERNAME AS UPDATEUSERNAME	");
+                sqlBuilder.AppendLine("	  FROM T_PP_ORDERPLAN O	");
+                //注塑所需要的表T_PP_WORKORDER
+                sqlBuilder.AppendLine("	  LEFT JOIN T_BD_PRODUCESHIFT P ON  P.PRODUCESHIFTTCODE=O.SHIFT_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_FACTORY F ON  F.FACTORY_CODE=O.FACTORY_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_PP_WORKORDER W ON  W.ORDERPLANID=O.PID	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_MD_MATERIAL M ON  M.MATERIAL_CODE=O.MATERIAL_CODE	");
+                //sqlBuilder.AppendLine("	  LEFT JOIN T_MD_WORKCELL WC ON  WC.WORKCELL_CODE=PRW.WORKCELL_CODE	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER C ON  C.USERID=O.CREATEUSER	");
+                sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER U ON U.USERID=O.UPDATEUSER	");
+
+                //whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE='{0}')", condition.ORDER_TYPE);
+                //查询条件
+                //if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false)
+                //{
+                //    whereBuilder.Append(" AND O.FACTORY_CODE = @FACTORY_CODE ");
+                //    parameters.Add(new DataParameter { ParameterName = "FACTORY_CODE", DataType = DbType.String, Value = condition.FACTORY_CODE });
+                //}
+                if (string.IsNullOrEmpty(condition.PLAN_NO) == false)
+                {
+                    whereBuilder.Append(" AND O.PLAN_NO = @PLAN_NO ");
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_NO", DataType = DbType.String, Value = condition.PLAN_NO });
+                }
+                //物料号
+                if (string.IsNullOrEmpty(condition.MATERIAL_CODE) == false)
+                {
+                    whereBuilder.Append(" AND O.MATERIAL_CODE = @MATERIAL_CODE ");
+                    parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE });
+                }
+                //工艺路线
+                //if (string.IsNullOrEmpty(condition.ROUTE_CODE) == false)
+                //{
+                //    whereBuilder.Append(" AND O.ROUTE_CODE = @ROUTE_CODE ");
+                //    parameters.Add(new DataParameter { ParameterName = "ROUTE_CODE", DataType = DbType.String, Value = condition.ROUTE_CODE });
+                //}
+                //班次编码
+                //if (string.IsNullOrEmpty(condition.SHIFT_CODE) == false)
+                //{
+                //    whereBuilder.Append(" AND O.SHIFT_CODE = @SHIFT_CODE ");
+                //    parameters.Add(new DataParameter { ParameterName = "SHIFT_CODE", DataType = DbType.String, Value = condition.SHIFT_CODE });
+                //}
+                //设备
+                //if (string.IsNullOrEmpty(condition.MACHINECODDE) == false)
+                //{
+                //    whereBuilder.Append(" AND O.MACHINECODDE = @MACHINECODDE ");
+                //    parameters.Add(new DataParameter { ParameterName = "MACHINECODDE", DataType = DbType.String, Value = condition.MACHINECODDE });
+                //}
+                //计划时间
+                if (condition.PLANTIMESTART != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND O.PLAN_DATE >= @PLANTIMESTART");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMESTART", DataType = DbType.String, Value = condition.PLANTIMESTART });
+                }
+                if (condition.PLANTIMEEND != DateTime.MinValue)
+                {
+                    whereBuilder.Append(" AND O.PLAN_DATE <= @PLANTIMEEND");
+                    parameters.Add(new DataParameter { ParameterName = "PLANTIMEEND", DataType = DbType.String, Value = condition.PLANTIMEEND });
+                }
+
+
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                return sqlBuilder.ToString();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 信息是否重复
+        /// <summary>
+        /// 判断计划单号是否存在
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns>true:已存在；fasel:不存在。</returns>
+        public int ExistsOrderPlan(TJOrderPlan model)
+        {
+            string PID = "";
+            int count = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+
+            try
+            {
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    PID = model.PID;
+                }
+                sqlBuilder.AppendLine("SELECT COUNT(*) FROM T_PP_ORDERPLAN 	");
+                sqlBuilder.AppendLine("	WHERE PID <> @PID AND PLAN_NO=@PLAN_NO");
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(),
+                         new DataParameter("PID", PID),
+                         new DataParameter { ParameterName = "PLAN_NO", Value = model.PLAN_NO }));
+                }
+
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        public int Insert(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                if (BaseSession != null)
+                {
+                    //插入基本信息
+                    count = BaseSession.Insert<TJOrderPlan>(model);
+                    //InsertOrderPlanTrace(BaseSession, model, "新增");
+                }
+                else
+                {
+                    using (IDataSession session = AppDataFactory.CreateMainSession())
+                    {
+                        //插入基本信息
+                        count = session.Insert<TJOrderPlan>(model);
+                        //InsertOrderPlanTrace(session, model, "新增");
+                    }
+                }
+                //using (IDataSession session = AppDataFactory.CreateMainSession())
+                //{
+                //    //插入基本信息
+                //    count = session.Insert<TJOrderPlan>(model);
+                //}
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 更新信息
+        /// <summary>
+        /// 更新信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        public int Update(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    var sql = $"update T_PP_TJFY_ORDERPLAN set MATERIAL_CODE = '{model.MATERIAL_CODE}',QTY = '{model.QTY}',PLAN_SEQ = '{model.PLAN_SEQ}',PLAN_NO = '{model.PLAN_NO}',MATERIAL_NAME = '{model.MATERIAL_NAME}',PLAN_STATE = '{model.PLAN_STATE}' where PID = '{model.PID}';";
+                    //更新基本信息
+                    count = session.ExecuteSql(sql);
+                    InsertOrderPlanTrace(session, model, "修改");
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>删除个数</returns>
+        //提交事务
+        public int Delete(TJOrderPlan model)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //删除基本信息
+                    count = session.Delete<TJOrderPlan>(model);
+                    //InsertOrderPlanTrace(session, model, "删除");
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 删除校验
+        /// <summary>
+        /// 删除校验
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int DelCheck(TJOrderPlan model)
+        {
+            int num = 0;
+            int state;
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder sqlBuilder2 = new StringBuilder();
+
+            sqlBuilder.AppendLine("	SELECT COMPLETE_QTY	");
+            sqlBuilder.AppendLine("	FROM T_PP_ORDERPLAN	");
+            sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+            sqlBuilder2.AppendLine("	SELECT PLAN_STATE	");
+            sqlBuilder2.AppendLine("	FROM T_PP_ORDERPLAN	");
+            sqlBuilder2.AppendLine("	WHERE PID = @PID 	");
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", model.PID)));
+                state = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder2.ToString(), new DataParameter("PID", model.PID)));
+            }
+            return num+state;
+
+        }
+        #endregion
+
+        #region 发布
+        /// <summary>
+        /// 发布信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>发布个数</returns>
+        public int PutOut(TJOrderPlan model, DataTable workOrderDt)
+        {
+
+            BaseSession = AppDataFactory.CreateMainSession();
+            IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+            IDbTransaction ids = dbConn.BeginTransaction();
+            try
+            {
+                if (workOrderDt.Rows != null)
+                {
+                    BaseSession.DbHelper.BulkCopyData(workOrderDt, "T_PP_WORKORDER", dbConn, ids);
+                    ids.Commit();
+                }
+            }
+            catch (Exception ex)
+            {
+                ids.Rollback();
+                throw ex;
+            }
+            int count = 0;
+            int count2 = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder sqlBuilder2 = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    sqlBuilder.AppendLine("	UPDATE T_PP_ORDERPLAN	");
+                    sqlBuilder.AppendLine("	SET PLAN_STATE='1'	");
+                    sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+
+                    sqlBuilder2.AppendLine("	UPDATE T_PP_WORKORDER	");
+                    sqlBuilder2.AppendLine("	SET STATE='1'	");
+                    sqlBuilder2.AppendLine("	WHERE ORDERPLANID = @PID 	");
+
+                    //发布更新基本信息
+                    parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = model.PID });
+                    count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray());
+                    count2 = session.ExecuteSql(sqlBuilder2.ToString(), parameters.ToArray());
+                }
+                return count;
+        }
+        #endregion
+
+        #region 发布 新
+        /// <summary>
+        /// 发布信息
+        /// 为了事物传递新的session zxd20171101
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>发布个数</returns>
+        public int PutOutBaseSession(TJOrderPlan model, DataTable workOrderDt)
+        {
+            if (BaseSession==null)
+            {
+                BaseSession = AppDataFactory.CreateMainSession();
+            }
+
+            //IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+            //IDbTransaction ids = dbConn.BeginTransaction();
+            //try
+            //{
+            //    if (workOrderDt.Rows != null)
+            //    {
+            //        BaseSession.DbHelper.BulkCopyData(workOrderDt, "T_PP_WORKORDER", dbConn, ids);
+            //        ids.Commit();
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    ids.Rollback();
+            //    throw ex;
+            //}
+            int count = 0;
+            int count2 = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder sqlBuilder2 = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+
+            sqlBuilder.AppendLine("	UPDATE T_PP_ORDERPLAN	");
+            sqlBuilder.AppendLine("	SET PLAN_STATE='1'	");
+            sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+
+            sqlBuilder2.AppendLine("	UPDATE T_PP_WORKORDER	");
+            sqlBuilder2.AppendLine("	SET STATE='1'	");
+            sqlBuilder2.AppendLine("	WHERE ORDERPLANID = @PID 	");
+
+            //发布更新基本信息
+            parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = model.PID });
+            //string sqlChange = ChangeSqlByDB(sqlBuilder.ToString(), session);
+            count = BaseSession.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray());
+            count2 = BaseSession.ExecuteSql(sqlBuilder2.ToString(), parameters.ToArray());
+
+            return count;
+        }
+        #endregion
+
+        #region 发布校验
+        /// <summary>
+        /// 发布校验
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int PutOutCheck(TJOrderPlan model)
+        {
+            int num = 0;
+            StringBuilder sqlBuilder = new StringBuilder();
+
+            sqlBuilder.AppendLine("	SELECT PLAN_STATE	");
+            sqlBuilder.AppendLine("	FROM T_PP_ORDERPLAN	");
+            sqlBuilder.AppendLine("	WHERE PID = @PID 	");
+
+            if (BaseSession != null)
+            {
+                num = Convert.ToInt32(BaseSession.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", model.PID)));
+
+            }
+            else
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    num = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), new DataParameter("PID", model.PID)));
+
+                }
+            }
+            return num;
+
+        }
+        #endregion
+
+        #region 导入
+        public ImportMessage GetImportData(List<TJOrderPlan> list)
+        {
+            ImportMessage em = new ImportMessage();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //设置祖先对象数据会话
+                    session.OpenTs();
+                    foreach (TJOrderPlan info in list)
+                    {
+                        if (info.IsNewInfo == true)
+                        {
+                            //插入信息
+                            int count = session.Insert<TJOrderPlan>(info);
+                            //InsertOrderPlanTrace(session, info, "新增");
+
+
+                            ////痕迹表
+                            //FISPlanRecord record = new FISPlanRecord();
+
+                            //record.PID = Guid.NewGuid().ToString();
+                            //record.MID = info.PID;
+                            //record.PLAN_NO = info.PLAN_NO;
+                            //record.MATERIAL_CODE = info.MATERIAL_CODE;
+                            //record.PLAN_QTY = info.QTY;
+                            //record.OPERATION_TYPE = "0";
+                            //record.CREATEUSER = info.CREATEUSER;
+                            //record.CREATEDATE = info.CREATEDATE;
+
+                            //int no = new OrderPlanDAL().InsertRecord(record);
+
+                            em.insertNum++;
+                        }
+                        else
+                        {
+                            //更新信息
+                            int count = session.Update<TJOrderPlan>(info);
+                            //InsertOrderPlanTrace(session, info, "修改");
+
+                            //#region 插入修改信息痕迹表
+                            ////插入修改信息痕迹表
+                            //FISPlanRecord record = new FISPlanRecord();
+
+                            //record.PID = Guid.NewGuid().ToString();
+                            //record.MID = info.PID;
+                            //record.PLAN_NO = info.PLAN_NO;
+                            //record.MATERIAL_CODE = info.MATERIAL_CODE;
+                            //record.PLAN_QTY = info.QTY;
+                            //record.OPERATION_TYPE = "1";
+                            //record.CREATEUSER = info.CREATEUSER;
+                            //record.CREATEDATE = info.CREATEDATE;
+
+                            //int no = new OrderPlanDAL().InsertRecord(record);
+                            #endregion
+
+                            em.updateNum++;
+                        }
+                    }
+                    session.CommitTs();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return em;
+        }
+        //#endregion
+
+        #region 获取导出的数据
+        /// <summary>
+        /// 获取导出的数据
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <returns>数据</returns>
+        public DataTable GetExportData(TJOrderPlan model)
+        {
+            DataTable dt = null;
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                //构成查询语句
+                sql = this.GetQuerySql(model, ref parameters);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    dt = session.GetTable(sql, parameters.ToArray());
+                    dt.TableName = "OrderPlanExp";
+                }
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 删除订单
+
+        public void DeleteOrderPlan(TJOrderPlan entity)
+        {
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                session.Delete<TJOrderPlan>(entity);
+                InsertOrderPlanTrace(session, entity, "删除");
+            }
+        }
+
+        #endregion
+
+        #region 改变更新订单
+        /// <summary>
+        /// 改变更新订单
+        /// </summary>
+        /// <param name="entity"></param>
+        public void ChangeOrderPlan(TJOrderPlan entity)
+        {
+            if (this.BaseSession != null)
+            {
+
+                this.BaseSession.Update<TJOrderPlan>(entity);
+            }
+            else
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+
+                    session.Update<TJOrderPlan>(entity);
+                }
+            }
+        }
+        #endregion
+
+        #region 获取流水号
+        /// <summary>
+        /// 获取流水号
+        /// </summary>
+        /// <param name = "" > 条件 </ param >
+        /// < returns > *信息 </ returns >
+        public TJOrderPlan GetOrderPlanSeq(TJOrderPlan condition)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = $"SELECT TOP 1 * FROM T_PP_TJFY_ORDERPLAN WHERE PLAN_DATE = '{condition.PLAN_DATE}' ORDER BY PLAN_SEQ DESC ";
+                
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    return session.Get<TJOrderPlan>(sql, parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "流水号本体-获取信息"
+                });
+                throw;
+            }
+        }
+        #endregion
+
+        #region 更新流水号信息
+        /// <summary>
+        /// 更新流水号信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        //public int UpdateFisPlan(FISPlan model)
+        //{
+        //    int count = 0;
+        //    try
+        //    {
+        //        if (this.BaseSession != null)
+        //        {
+        //            count = BaseSession.Update<FISPlan>(model);
+        //        }
+        //        else
+        //        {
+        //            using (IDataSession session = AppDataFactory.CreateMainSession())
+        //            {
+        //                //更新基本信息
+        //                count = session.Update<FISPlan>(model);
+        //            }
+        //        }
+        //        return count;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+        #endregion
+
+        #region 插入流水号信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name=model"">物料号信息</param>
+        /// <returns>插入行数</returns>
+        //public int InsertFisPlan(FISPlan model)
+        //{
+        //    int count = 0;
+        //    try
+        //    {
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            //插入基本信息
+        //            count = session.Insert<FISPlan>(model);
+        //        }
+        //        return count;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "物料号信息数据层-插入信息"
+        //        });
+        //        throw;
+        //    }
+        //}
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        //public int InsertRecord(FISPlanRecord record)
+        //{
+        //    int no = 0;
+        //    try
+        //    {
+        //        if (BaseSession != null)
+        //        {
+        //            //插入基本信息
+        //            no = BaseSession.Insert<FISPlanRecord>(record);
+        //        }
+        //        else
+        //        {
+        //            using (IDataSession session = AppDataFactory.CreateMainSession())
+        //            {
+        //                //插入基本信息
+        //                 no = session.Insert<FISPlanRecord>(record);
+        //            }
+        //        }
+        //        return no;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+        #endregion
+
+        #region 配置设备人员
+
+        #region 配置设备人员
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        //public DataPage FisPlanRecordList(FISPlanRecord condition, DataPage page)
+        //{
+        //    string sql = "";
+        //    List<DataParameter> parameters = new List<DataParameter>();
+        //    try
+        //    {
+        //        sql = this.GetFisPlanRecordSql(condition, ref parameters);
+
+        //        //分页关键字段及排序
+        //        page.KeyName = "PID";
+        //        if (string.IsNullOrEmpty(page.SortExpression))
+        //        {
+        //            page.SortExpression = "CREATEDATE DESC";
+        //        }
+
+        //        using (IDataSession session = AppDataFactory.CreateMainSession())
+        //        {
+        //            page = session.GetDataPage<FISPlanRecord>(sql, parameters.ToArray(), page);
+        //        }
+        //        return page;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogManager.LogHelper.Error(new LogInfo()
+        //        {
+        //            ErrorInfo = ex,
+        //            Tag = ex.StackTrace,
+        //            Info = "订单信息数据层-获取列表"
+        //        });
+        //        throw;
+        //    }
+        //}
+        #endregion
+
+        #region 获取查询语句
+        /// <summary>
+        /// 获取查询语句
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <param name="parameters">参数</param>
+        /// <returns>查询语句</returns>
+        //private string GetFisPlanRecordSql(FISPlanRecord condition, ref List<DataParameter> parameters)
+        //{
+        //    StringBuilder sqlBuilder = new StringBuilder();
+        //    StringBuilder whereBuilder = new StringBuilder();
+        //    try
+        //    {
+        //        //构成查询语句 
+        //        sqlBuilder.AppendLine("	SELECT P.PID	");
+        //        sqlBuilder.AppendLine("	      ,P.MID	");
+        //        sqlBuilder.AppendLine("	      ,P.PLAN_NO	");
+        //        sqlBuilder.AppendLine("	      ,P.MATERIAL_CODE	");
+        //        sqlBuilder.AppendLine("	      ,P.PLAN_QTY	");
+        //        sqlBuilder.AppendLine("	      ,P.OPERATION_TYPE	");
+        //        sqlBuilder.AppendLine("	      ,P.CREATEUSER	");
+        //        sqlBuilder.AppendLine("	      ,P.CREATEDATE	");;
+        //        sqlBuilder.AppendLine("	      ,C.USERNAME AS CREATEUSERNAME	");
+        //        sqlBuilder.AppendLine("	  FROM T_AW_FISPLANRECORD P	");
+        //        sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER C ON  C.USERID=P.CREATEUSER	");
+
+        //        //查询条件
+        //        if (string.IsNullOrEmpty(condition.MID) == false)
+        //        {
+        //            whereBuilder.Append(" AND P.MID= @MID ");
+        //            parameters.Add(new DataParameter { ParameterName = "MID", DataType = DbType.String, Value = condition.PLAN_NO });
+        //        }
+
+        //        if (whereBuilder.Length > 0)
+        //        {
+        //            sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+        //        }
+        //        return sqlBuilder.ToString();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+        #endregion
+
+        #endregion
+
+        #region 插入操作记录
+
+        public int InsertOrderPlanTrace(IDataSession Bsession, TJOrderPlan model, string operatType)
+        {
+            try
+            {
+                var sql = $" insert into T_PP_TJFY_ORDERPLANTRACE(PID,PLAN_NO,PLAN_SEQ,PLAN_STATE,MATERIAL_CODE,QTY,PLAN_DATE,CREATEDATE,CREATEUSER,OPERATE_TYPE) " +
+                    $" VALUES ('{Guid.NewGuid().ToString()}','{model.PLAN_NO}','{model.PLAN_SEQ}','{model.PLAN_STATE}','{model.MATERIAL_CODE}','{model.QTY}','{model.PLAN_DATE}','{model.UPDATEDATE}','{model.UPDATEUSER}','{operatType}');";
+                return Bsession.ExecuteSql(sql);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs
new file mode 100644
index 0000000..48331ac
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs
@@ -0,0 +1,1115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data;
+using QMAPP.FJC.Entity.ProductionPlan;
+using System.Data;
+using QMAPP.Entity;
+using QMAPP.DAL;
+using QMFrameWork.Log;
+using QMAPP.FJC.Entity.TianJin;
+//using QMAPP.FJC.Entity.FIS;
+
+namespace QMAPP.FJC.DAL.TianJin
+{
+    /// <summary>
+    ///　模块名称：派工单
+    ///　作    者：张鹏
+    ///　编写日期：2017年10月24日
+    /// </summary>
+    public class TJWorkOrderDAL : BaseDAL
+    {
+
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>*信息</returns>
+        public TJWorkOrder Get(TJWorkOrder info)
+        {
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    info = session.Get<TJWorkOrder>(info);
+                }
+                return info;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        public TJWorkOrder GetOne(string ORDERPLANID)
+        {
+            string sql = "SELECT * FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) where [ORDERPLANID]='" + ORDERPLANID + "'";
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                if (BaseSession != null)
+                {
+                    return BaseSession.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public TJWorkOrder GetOneByID(string id)
+        {
+            string sql = "SELECT * FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) where [PID]='" + id + "'";
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                if (BaseSession != null)
+                {
+                    return BaseSession.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public TJWorkOrder GetOneByOrderNO(string ORDERPLANNO)
+        {
+            string sql = "SELECT * FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) where [ORDERPLAN_NO]='" + ORDERPLANNO + "'";
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                if (BaseSession != null)
+                {
+                    return BaseSession.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public TJWorkOrder GetOneByProduct(string productCode)
+        {
+            string sql = "SELECT * FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) where [REMARK]='" + productCode + "'";
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                if (BaseSession != null)
+                {
+                    return BaseSession.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql, parameters.ToArray()).FirstOrDefault();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 获取计划单号下所有派工单信息
+        /// </summary>
+        /// <param name="ORDERPLANID"></param>
+        /// <returns></returns>
+        public int GetAllWorkOrder(string ORDERPLANID)
+        {
+            int count = 0;
+            string sql = "SELECT COUNT(1) FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) where [ORDERPLANID]='" + ORDERPLANID + "' AND STATE<>0";
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    count =Convert.ToInt32(session.ExecuteSqlScalar(sql, parameters.ToArray()));
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return count;
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataPage GetList(TJWorkOrder condition, DataPage page)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = this.GetQuerySql(condition, ref parameters);
+                //分页关键字段及排序
+                page.KeyName = "PID";
+                if (string.IsNullOrEmpty(page.SortExpression))
+                    page.SortExpression = "UPDATEDATE DESC";
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    page = session.GetDataPage<TJWorkOrder>(sql, parameters.ToArray(), page);
+                }
+                return page;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public List<TJWorkOrder> GetList(TJWorkOrder condition)
+        {
+            List<TJWorkOrder> workOrderList = new List<TJWorkOrder>();
+            string sql = "select * from T_PP_TJFY_WORKORDER WITH(NOLOCK) t where 1=1 ";
+            if (string.IsNullOrEmpty(condition.ORDERPLANID) == false)
+            {
+                sql += string.Format(" and ORDERPLANID='{0}'",condition.ORDERPLANID);
+            }
+
+
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                workOrderList = session.GetList<TJWorkOrder>(sql, new List<DataParameter>().ToArray()).ToList<TJWorkOrder>();
+            }
+
+            return workOrderList;
+        }
+
+
+        public List<TJWorkOrder> GetWorkOrderInfo(string planno)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT W.[PID]");
+                sql.AppendFormat("      ,W.[ORDERPLANID] ");
+                sql.AppendFormat("      ,W.[ORDERPLAN_NO] ");
+                sql.AppendFormat("      ,W.[ORDER_TYPE] ");
+                sql.AppendFormat("      ,W.[SEQ] ");
+                sql.AppendFormat("      ,W.[MATERIAL_CODE] ");
+                sql.AppendFormat("      ,M.[MATERIAL_NAME] ");
+                sql.AppendFormat("      ,W.[PBOM_CODE] ");
+                sql.AppendFormat("      ,W.[QTY] ");
+                sql.AppendFormat("      ,W.[COMPLETE_QTY] ");
+                sql.AppendFormat("      ,W.[PLAN_DATE] ");
+                sql.AppendFormat("      ,W.[SHIFT_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_NAME] ");
+                sql.AppendFormat("      ,W.[WORKCELL_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCELL_NAME] ");
+                sql.AppendFormat("      ,W.[WORKLOC_CODE] ");
+                sql.AppendFormat("      ,W.[REMARK] ");
+                sql.AppendFormat("      ,W.[EQPT_NAME] ");
+                sql.AppendFormat("      ,W.[EQPT_CODE] ");
+                sql.AppendFormat("      ,W.[STATE] ");
+                sql.AppendFormat("      ,W.[MOULD_CODE] ");
+                sql.AppendFormat("      ,W.[PRI] ");
+                sql.AppendFormat("      ,W.[UPDATEDATE] ");
+                sql.AppendFormat("      ,W.[PRINTED] ");
+                sql.AppendFormat("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendFormat("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendFormat("  FROM [T_PP_TJFY_WORKORDER] AS W WITH(NOLOCK) ");
+                sql.AppendFormat("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendFormat("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendFormat("  LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
+                sql.AppendFormat("    ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
+                sql.AppendFormat(" WHERE P.[PLAN_NO]=@planno ");
+                sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("planno", planno));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 获取指定工序的生产计划清单
+        /// </summary>
+        /// <param name="workcellcode">工序编码</param>
+        /// <param name="count">数量</param>
+        /// <param name="filter">过滤选项：0全部；1隐藏挂起；2只看挂起</param>
+        /// <returns></returns>
+        public List<TJWorkOrder> GetOrderInCell(string workcellcode,int filter=0, int count = 20)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count);
+                sql.AppendFormat("      ,W.[ORDERPLANID] ");
+                sql.AppendFormat("      ,W.[ORDERPLAN_NO] ");
+                sql.AppendFormat("      ,W.[ORDER_TYPE] ");
+                sql.AppendFormat("      ,W.[SEQ] ");
+                sql.AppendFormat("      ,W.[MATERIAL_CODE] ");
+                sql.AppendFormat(" 	    ,M.[MATERIAL_NAME] ");
+                sql.AppendFormat("      ,W.[PBOM_CODE] ");
+                sql.AppendFormat("      ,W.[QTY] ");
+                sql.AppendFormat("      ,W.[COMPLETE_QTY] ");
+                sql.AppendFormat("      ,W.[PLAN_DATE] ");
+                sql.AppendFormat("      ,W.[SHIFT_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_NAME] ");
+                sql.AppendFormat("      ,W.[WORKCELL_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCELL_NAME] ");
+                sql.AppendFormat("      ,W.[WORKLOC_CODE] ");
+                sql.AppendFormat("      ,W.[REMARK] ");
+                sql.AppendFormat("      ,W.[EQPT_NAME] ");
+                sql.AppendFormat("      ,W.[EQPT_CODE] ");
+                sql.AppendFormat("      ,W.[STATE] ");
+                sql.AppendFormat("      ,W.[MOULD_CODE] ");
+                sql.AppendFormat("      ,W.[PRI] ");
+                sql.AppendFormat("      ,W.[UPDATEDATE] ");
+                sql.AppendFormat("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendFormat("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendFormat("  FROM [T_PP_TJFY_WORKORDER] AS W WITH(NOLOCK) ");
+                sql.AppendFormat("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendFormat("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendFormat("  LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK)");
+                sql.AppendFormat("    ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
+                sql.AppendFormat(" WHERE W.[WORKCELL_CODE]=@workcellcode ");
+                switch (filter)
+                {
+                    case 1:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]<>4 ");
+                            break;
+                        }
+                    case 2:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]=4 ");
+                            break;
+                        }
+                }
+                sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("workcellcode", workcellcode));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch(Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 获取指定工序的生产计划清单
+        /// </summary>
+        /// <param name="workcellcode">工序编码</param>
+        /// <param name="count">数量</param>
+        /// <param name="filter">过滤选项：0全部；1隐藏挂起；2只看挂起</param>
+        /// <returns></returns>
+        public List<TJWorkOrder> GetOrderUnPrinted(string routecode, int filter = 0, int count = 20)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count);
+                sql.AppendFormat("      ,W.[ORDERPLANID] ");
+                sql.AppendFormat("      ,W.[ORDERPLAN_NO] ");
+                sql.AppendFormat("      ,W.[ORDER_TYPE] ");
+                sql.AppendFormat("      ,W.[SEQ] ");
+                sql.AppendFormat("      ,W.[MATERIAL_CODE] ");
+                sql.AppendFormat(" 	    ,M.[MATERIAL_NAME] ");
+                sql.AppendFormat("      ,W.[PBOM_CODE] ");
+                sql.AppendFormat("      ,W.[QTY] ");
+                sql.AppendFormat("      ,W.[COMPLETE_QTY] ");
+                sql.AppendFormat("      ,W.[PLAN_DATE] ");
+                sql.AppendFormat("      ,W.[SHIFT_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_NAME] ");
+                sql.AppendFormat("      ,W.[WORKCELL_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCELL_NAME] ");
+                sql.AppendFormat("      ,W.[WORKLOC_CODE] ");
+                sql.AppendFormat("      ,W.[REMARK] ");
+                sql.AppendFormat("      ,W.[EQPT_NAME] ");
+                sql.AppendFormat("      ,W.[EQPT_CODE] ");
+                sql.AppendFormat("      ,W.[STATE] ");
+                sql.AppendFormat("      ,W.[MOULD_CODE] ");
+                sql.AppendFormat("      ,W.[PRI] ");
+                sql.AppendFormat("      ,W.[UPDATEDATE] ");
+                sql.AppendFormat("      ,W.[PRINTED] ");
+                sql.AppendFormat("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendFormat("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendFormat("  FROM [T_PP_TJFY_WORKORDER] AS W WITH(NOLOCK) ");
+                sql.AppendFormat("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendFormat("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendFormat("  LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
+                sql.AppendFormat("    ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
+                sql.AppendFormat(" WHERE P.[ROUTE_CODE]=@routecode ");
+                sql.AppendFormat("   AND W.[PRINTED]='0' ");
+                switch (filter)
+                {
+                    case 1:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]<>4 ");
+                            break;
+                        }
+                    case 2:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]=4 ");
+                            break;
+                        }
+                }
+                sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("routecode", routecode));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<TJWorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 获取指定工序的待完成计划数量
+        /// </summary>
+        /// <param name="workcellcode">工序编码</param>
+        /// <param name="shift">不指定班次则查询全部计划</param>
+        /// <param name="date">不指定班次则无需输入日期</param>
+        /// <returns></returns>
+        public int GetOrderCountInCell(string workcellcode,string shift,DateTime date)
+        {
+            try
+            {
+                List<DataParameter> parameters = new List<DataParameter>();
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT COUNT(*) ");
+                sql.AppendFormat("  FROM [T_PP_TJFY_WORKORDER] WITH(NOLOCK) ");
+                sql.AppendFormat(" WHERE [WORKCELL_CODE]=@workcellcode ");
+                sql.AppendFormat("   AND [STATE]<>4");
+                if (!string.IsNullOrWhiteSpace(shift))
+                {
+                    sql.AppendFormat("   AND [SHIFT_CODE]=@shift");
+                    parameters.Add(new DataParameter("shift", shift));
+                    //sql.AppendFormat("   AND DATEDIFF(DAY,[PLAN_DATE],@date)=0");
+                    //parameters.Add(new DataParameter("date", date));
+                    sql.AppendFormat("   AND [PLAN_DATE] BETWEEN @date1 AND @date2");
+                    parameters.Add(new DataParameter("date1", date.Date));
+                    parameters.Add(new DataParameter("date2", date.Date.AddDays(1)));
+                }
+                parameters.Add(new DataParameter("workcellcode", workcellcode));
+                
+                
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return (int)session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 获取查询语句
+        /// <summary>
+        /// 获取查询语句
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <param name="parameters">参数</param>
+        /// <returns>查询语句</returns>
+        private string GetQuerySql(TJWorkOrder condition, ref List<DataParameter> parameters)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            try
+            {
+                //构成查询语句
+                sqlBuilder.Append("SELECT PID,ORDERPLANID,ORDERPLAN_NO,ORDER_TYPE,SEQ,MATERIAL_CODE,PBOM_CODE,QTY,COMPLETE_QTY,PLAN_DATE,SHIFT_CODE,WORKCENTER_CODE,WORKCENTER_NAME,WORKCELL_CODE,WORKCELL_NAME,WORKLOC_CODE,REMARK,EQPT_NAME,EQPT_CODE,STATE ");
+                sqlBuilder.Append("FROM T_PP_TJFY_WORKORDER WITH(NOLOCK) ");
+                whereBuilder.Append(" AND FLGDEL<> '1' ");
+                //查询条件
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                return sqlBuilder.ToString();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 获取导出的数据
+        /// <summary>
+        /// 获取导出的数据
+        /// </summary>
+        /// <param name="user">查询条件</param>
+        /// <returns>数据</returns>
+        public DataTable GetExportData(TJWorkOrder info)
+        {
+            DataTable dt = null;
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                //构成查询语句
+                sql = this.GetQuerySql(info, ref parameters);
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    dt = session.GetTable(sql, parameters.ToArray());
+                    dt.TableName = "TJWorkOrder";
+                }
+                return dt;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 信息是否重复
+        /// <summary>
+        /// 判断名称是否存在
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns>true:已存在；fasel:不存在。</returns>
+        public bool Exists(TJWorkOrder info)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            StringBuilder whereBuilder = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            int count = 0;
+            try
+            {
+                sqlBuilder.Append("SELECT COUNT(0) FROM T_PP_TJFY_WORKORDER WITH(NOLOCK) ");
+                if (info.PID == null)
+                {
+                    info.PID = "";
+                }
+                whereBuilder.Append(" AND PID <> @PID ");
+                parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID });
+
+                //添加进行无重复字段判断代码
+
+                if (whereBuilder.Length > 0)
+                {
+                    sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), parameters.ToArray()));
+                }
+                return count > 0;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 插入信息
+        /// <summary>
+        /// 插入信息(单表)
+        /// </summary>
+        /// <param name="">信息</param>
+        /// <returns>插入行数</returns>
+        public int Insert(TJWorkOrder info)
+        {
+            try
+            {
+                if (BaseSession != null)
+                {
+                    return BaseSession.Insert<TJWorkOrder>(info);
+                }
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //插入基本信息
+                    return session.Insert<TJWorkOrder>(info);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 更新信息
+        /// <summary>
+        /// 更新信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>更新行数</returns>
+        public int Update(TJWorkOrder info)
+        {
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //更新基本信息
+                    count = session.Update<TJWorkOrder>(info);
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 逻辑删除
+        /// <summary>
+        /// 逻辑删除信息
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns>删除个数</returns>
+        public int Delete(TJWorkOrder info)
+        {
+            StringBuilder sqlBuilder = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            int count = 0;
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //删除基本信息
+                    sqlBuilder.Append("UPDATE T_PP_TJFY_WORKORDER ");
+                    sqlBuilder.Append("SET    FLGDEL = '1' ");
+                    sqlBuilder.Append("WHERE  PID = @PID ");
+                    parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID });
+                    count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray());
+                }
+                return count;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 删除派工单
+        /// </summary>
+        /// <param name="entity"></param>
+        public void BatchDeleteByOrderPlan(TJWorkOrder entity)
+        {
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    string deleteSql = string.Format("delete from T_PP_TJFY_WORKORDER  where ORDERPLANID='{0}' ", entity.ORDERPLANID);
+                    session.ExecuteSql(deleteSql, new List<DataParameter>().ToArray());
+                }
+                
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+
+        }
+
+        #region 导入
+        public ImportMessage GetImportData(List<TJWorkOrder> list)
+        {
+            ImportMessage em = new ImportMessage();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //设置祖先对象数据会话
+                    session.OpenTs();
+                    foreach (TJWorkOrder info in list)
+                    {
+                        if (info.IsNewInfo)
+                        {
+                            //插入信息
+                            int count = session.Insert<TJWorkOrder>(info);
+                            em.insertNum++;
+                        }
+                        else
+                        {
+                            //更新信息
+                            int count = session.Update<TJWorkOrder>(info);
+                            em.updateNum++;
+                        }
+                    }
+                    session.CommitTs();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return em;
+        }
+        #endregion
+
+        /// <summary>
+        /// 获取指定工位正在执行的派工单
+        /// </summary>
+        /// <param name="workloccode"></param>
+        /// <returns></returns>
+        public TJWorkOrder GetWorkingOrderInLoc(string workloccode,string mouldcode)
+        {
+            try
+            {
+                List<DataParameter> parameters = new List<DataParameter>();
+                StringBuilder sql = new StringBuilder();
+                sql.AppendLine("SELECT O.* ");
+                sql.AppendLine("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendLine("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendLine("  FROM [T_PP_TJFY_WORKORDER] AS O WITH(NOLOCK) ");
+                sql.AppendLine("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendLine("    ON P.[PID]=O.[ORDERPLANID] ");
+                sql.AppendLine(" WHERE O.[WORKLOC_CODE]=@workloccode ");
+                sql.AppendLine("   AND O.[MOULD_CODE]=@mouldcode ");
+                sql.AppendLine("   AND O.[STATE]='2' "); //工单状态为执行中
+                parameters.Add(new DataParameter("workloccode", workloccode));
+                parameters.Add(new DataParameter("mouldcode", mouldcode));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.Get<TJWorkOrder>(sql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 获取第一条匹配的派工单
+        /// </summary>
+        /// <param name="workcellcode">工序</param>
+        /// <param name="productmaterial">产品物料号</param>
+        /// <returns></returns>
+        public TJWorkOrder GetFirstMatchOrder(string workcellcode, string productmaterial,string planpid="")
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+            sql.AppendLine("SELECT TOP 1 O.* ");
+            sql.AppendLine("      ,P.[IGNORE_FISBREAK] ");
+            sql.AppendLine("      ,P.[FIS_ASMSETCODE] ");
+            sql.AppendLine("  FROM [T_PP_TJFY_WORKORDER] AS O WITH(NOLOCK) ");
+            sql.AppendLine("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+            sql.AppendLine("    ON P.[PID]=O.[ORDERPLANID] ");
+            sql.AppendLine(" WHERE O.[WORKCELL_CODE]=@workcellcode ");
+            if (!string.IsNullOrWhiteSpace(planpid))
+            {
+                sql.AppendLine("   AND O.[ORDERPLANID]=@planpid");
+                parameters.Add(new DataParameter("planpid", planpid));
+            }
+            sql.AppendLine("   AND (EXISTS (SELECT 1 ");
+            sql.AppendLine("                 FROM T_MD_PBOM_ITEM AS I ");
+            sql.AppendLine("                WHERE O.PBOM_CODE = I.PBOM_CODE ");
+            sql.AppendLine("				  AND I.FLGDEL = '0' ");
+            sql.AppendLine("				  AND I.MATERIAL_CODE = @materialcode) ");
+            sql.AppendLine("	    OR O.[MATERIAL_CODE]=@materialcode) ");
+            sql.AppendLine("   AND (O.[STATE]='0' OR O.[STATE]='1') ");
+            sql.AppendLine(" ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P.PLAN_SEQ,SEQ "); //排序为 FIS优先、日期正序、顺序号正序
+            parameters.Add(new DataParameter("workcellcode", workcellcode));
+            parameters.Add(new DataParameter("materialcode", productmaterial));
+            using (var session = AppDataFactory.CreateMainSession())
+            {
+                return session.Get<TJWorkOrder>(sql.ToString(), parameters.ToArray());
+            }
+        }
+
+        /// <summary>
+        /// 获取工序下匹配的派工单
+        /// </summary>
+        /// <param name="workcellcode">工序</param>
+        /// <returns></returns>
+        public List<TJWorkOrder> GetMatchOrders(string workcellcode,string planpid="")
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+
+            sql.AppendLine("SELECT W.* ");
+            sql.AppendLine("      ,P.[IGNORE_FISBREAK] ");
+            sql.AppendLine("      ,P.[FIS_ASMSETCODE] ");
+            sql.AppendLine("  FROM [T_PP_TJFY_WORKORDER] AS W WITH(NOLOCK) ");
+            sql.AppendLine("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+            sql.AppendLine("    ON P.[PID]=W.[ORDERPLANID] ");
+            sql.AppendLine(" WHERE W.SEQ = (SELECT TOP 1 SEQ ");
+            sql.AppendLine("				  FROM [T_PP_TJFY_WORKORDER] AS O WITH(NOLOCK) ");
+            sql.AppendLine("                  LEFT JOIN [T_PP_ORDERPLAN] AS P1 WITH(NOLOCK) ");
+            sql.AppendLine("                    ON P1.[PID]=O.[ORDERPLANID] ");
+            sql.AppendLine("                 WHERE O.[WORKCELL_CODE]=@workcellcode ");
+            sql.AppendLine("                   AND (O.[STATE]='0' OR O.[STATE]='1') ");
+            if (!string.IsNullOrWhiteSpace(planpid))
+            {
+                sql.AppendLine("                   AND O.[ORDERPLANID]=@planpid");
+            }
+            sql.AppendLine("                 ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P1.PLAN_SEQ,SEQ) ");//排序为 FIS优先、日期正序、计划顺序号、工单顺序号正序
+            sql.AppendLine("   AND W.[WORKCELL_CODE]=@workcellcode ");
+            sql.AppendLine("   AND (W.[STATE]='0' OR W.[STATE]='1') ");
+            if (!string.IsNullOrWhiteSpace(planpid))
+            {
+                sql.AppendLine("   AND W.[ORDERPLANID]=@planpid");
+                parameters.Add(new DataParameter("planpid", planpid));
+            }
+
+            parameters.Add(new DataParameter("workcellcode", workcellcode));
+            using (var session = AppDataFactory.CreateMainSession())
+            {
+                return session.GetList<TJWorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+            }
+        }
+
+
+        #region 改变派工单
+        /// <summary>
+        /// 改变派工单
+        /// </summary>
+        /// <param name="entity"></param>
+        public void ChangeByOrderPlan(TJWorkOrder entity)
+        {
+            if (this.BaseSession != null)
+            {
+
+                this.BaseSession.Update<TJWorkOrder>(entity);
+            }
+            else
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+
+                    session.Update<TJWorkOrder>(entity);
+                }
+            }
+
+        }
+        #endregion
+        /// <summary>
+        /// 获取派工单
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public TJWorkOrder GetworkOrderInfo(TJWorkOrder model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT TOP 1 * FROM T_PP_TJFY_WORKORDER WITH(NOLOCK) WHERE STATE=0 ";
+
+                if (string.IsNullOrEmpty(model.ORDERPLANID) == false)
+                {
+                    sql += " AND ORDERPLANID = @ORDERPLANID";
+                    parameters.Add(new DataParameter("ORDERPLANID", model.ORDERPLANID));
+                }
+                if (BaseSession != null)
+                {
+                    //获取信息
+                    model = BaseSession.Get<TJWorkOrder>(sql, parameters.ToArray());
+                }
+                else
+                {
+                    using (IDataSession session = AppDataFactory.CreateMainSession())
+                    {
+                        //获取信息
+                        model = session.Get<TJWorkOrder>(sql, parameters.ToArray());
+                    }
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 获取指定日期前的FIS计划顺序号
+        /// </summary>
+        /// <param name="plandate"></param>
+        /// <param name="workcentercode"></param>
+        /// <returns></returns>
+        public string GetLastFISSEQ(DateTime plandate, string workcentercode)
+        {
+            StringBuilder sql = new StringBuilder() ;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql.AppendLine("SELECT TOP 1 [PLAN_SEQ] ");
+                sql.AppendLine("  FROM [T_PP_ORDERPLAN] WITH(NOLOCK) ");
+                sql.AppendLine(" WHERE [PLANSOURCE]='0'  ");
+                sql.AppendLine("   AND [PLAN_DATE]<@plandate ");
+                sql.AppendLine("   AND [WORKCENTER_CODE]=@workcentercode ");
+                sql.AppendLine(" ORDER BY [PLAN_DATE] DESC ");
+
+                parameters.Add(new DataParameter("plandate", plandate));
+                parameters.Add(new DataParameter("workcentercode", workcentercode));
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    var ret= session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray());
+                    if (ret != null)
+                    {
+                        return ret.ToString();
+                    }
+                    else
+                    {
+                        return "";
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+        /// <summary>
+        /// 根据模架搜索工单
+        /// </summary>
+        /// <param name="mouldcode"></param>
+        /// <param name="workcellcode"></param>
+        public TJWorkOrder SearchByMould(string mouldcode, string workcellcode)
+        {
+
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                List<DataParameter> parameters = new List<DataParameter>();
+
+                sql.AppendLine("SELECT TOP 1 W.*  ");
+                sql.AppendLine("  FROM T_PP_TJFY_WORKORDER AS W  WITH(NOLOCK) ");
+                sql.AppendLine("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendLine("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendLine("  LEFT JOIN T_MD_MATERIAL AS M WITH(NOLOCK) ");
+                sql.AppendLine("    ON M.MATERIAL_CODE=W.MATERIAL_CODE ");
+                sql.AppendLine("  LEFT JOIN T_QT_MATERIAL_BINDING AS MB WITH(NOLOCK) ");
+                sql.AppendLine("    ON MB.MATERIAL_CODE=M.MATERIAL_TYPE_CODE ");
+                sql.AppendLine("   AND MB.BINDING_TYPE='ASSY' ");
+                sql.AppendLine(" WHERE MB.TARGET_CODE=@mouldcode ");
+                sql.AppendLine("   AND W.WORKCELL_CODE=@workcellcode ");
+                sql.AppendLine("   AND (W.STATE='1' OR W.STATE='0') ");
+                sql.AppendLine(" ORDER BY W.UPDATEDATE,W.PRI,w.PLAN_DATE,P.PLAN_SEQ,W.SEQ ");
+
+                parameters.Add(new DataParameter("mouldcode", mouldcode));
+                parameters.Add(new DataParameter("workcellcode", workcellcode));
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    return session.Get<TJWorkOrder>(sql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息"
+                });
+                throw;
+            }
+        }
+
+        
+
+        public List<TJWorkOrder> GetListByID(string[] orderid)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                List<DataParameter> parameters = new List<DataParameter>();
+
+                string ids =  string.Join("','", orderid);
+
+                sql.AppendFormat("SELECT * FROM T_PP_TJFY_WORKORDER WITH(NOLOCK) WHERE PID IN ('{0}')", ids);
+    
+
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    //获取信息
+                    return session.GetList<TJWorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "信息数据层-获取信息GetListByID"
+                });
+                throw;
+            }
+        }
+        /// <summary>
+        /// 批量更新
+        /// </summary>
+        /// <param name="orders"></param>
+        /// <returns></returns>
+        public int Update(List<TJWorkOrder> orders)
+        {
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                //获取信息
+                return session.Update(orders);
+            }
+        }
+        /// <summary>
+        /// 批量删除
+        /// </summary>
+        /// <param name="orders"></param>
+        /// <returns></returns>
+        public int Delete(List<TJWorkOrder> orders)
+        {
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                //获取信息
+                return session.Delete(orders);
+            }
+        }
+
+        public TJWorkOrder GetWorkingOrderWithProduct(string workcellcode, string productcode, string planpid = "")
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+            sql.AppendLine("SELECT TOP 1 O.* ");
+            sql.AppendLine("      ,P.[IGNORE_FISBREAK] ");
+            sql.AppendLine("      ,P.[FIS_ASMSETCODE] ");
+            sql.AppendLine("  FROM [T_PP_TJFY_WORKORDER] AS O WITH(NOLOCK) ");
+            sql.AppendLine("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+            sql.AppendLine("    ON P.[PID]=O.[ORDERPLANID] ");
+            sql.AppendLine(" WHERE O.[WORKCELL_CODE]=@workcellcode ");
+            if (!string.IsNullOrWhiteSpace(planpid))
+            {
+                sql.AppendLine("   AND O.[ORDERPLANID]=@planpid");
+                parameters.Add(new DataParameter("planpid", planpid));
+            }
+            sql.AppendLine("   AND O.[REMARK]=@productcode");
+            sql.AppendLine("   AND (O.[STATE]='0' OR O.[STATE]='1') ");
+            sql.AppendLine(" ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P.PLAN_SEQ,SEQ "); //排序为 FIS优先、日期正序、顺序号正序
+            parameters.Add(new DataParameter("workcellcode", workcellcode));
+            parameters.Add(new DataParameter("productcode", productcode));
+            using (var session = AppDataFactory.CreateMainSession())
+            {
+                return session.Get<TJWorkOrder>(sql.ToString(), parameters.ToArray());
+            }
+        }
+
+        public int GetDayPlanCount(string workcentercode, DateTime date)
+        {
+            try
+            {
+                List<DataParameter> parameters = new List<DataParameter>();
+                StringBuilder sql = new StringBuilder();
+                sql.AppendLine("SELECT ISNULL(SUM(QTY),0)  ");
+                sql.AppendLine("  FROM T_PP_ORDERPLAN WITH(NOLOCK) ");
+                sql.AppendLine(" WHERE WORKCENTER_CODE=@workcentercode  ");
+                //sql.AppendLine("   AND DATEDIFF(DAY,PLAN_DATE,@date)=0 ");
+                sql.AppendFormat("   AND [PLAN_DATE] BETWEEN @date1 AND @date2");
+                parameters.Add(new DataParameter("date1", date.Date));
+                parameters.Add(new DataParameter("date2", date.Date.AddDays(1)));
+
+                parameters.Add(new DataParameter("workcentercode", workcentercode));
+                //parameters.Add(new DataParameter("date", date));
+
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return (int)session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public int SetOrderPrinted(string orderpid)
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+            sql.AppendLine("UPDATE T_PP_TJFY_WORKORDER SET PRINTED='1' WHERE PID=@orderpid");
+            parameters.Add(new DataParameter("orderpid", orderpid));
+            
+            using (var session = AppDataFactory.CreateMainSession())
+            {
+                return session.ExecuteSql(sql.ToString(), parameters.ToArray());
+            }
+        }
+
+        public List<TJOrderPlan> GetLastFISPlan(string workcellcode, string routecode)
+        {
+            List<DataParameter> parameters = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+            sql.AppendLine("SELECT TOP 2 P.* ");
+            sql.AppendLine("  FROM T_PP_ORDERPLAN AS P WITH(NOLOCK)  ");
+            sql.AppendLine("  LEFT JOIN T_PP_TJFY_WORKORDER AS W WITH(NOLOCK)  ");
+            sql.AppendLine("    ON W.ORDERPLAN_NO=P.PLAN_NO  ");
+            sql.AppendLine(" WHERE P.PLANSOURCE='0' ");
+            sql.AppendLine("   AND P.ROUTE_CODE=@routecode ");
+            sql.AppendLine("   AND ((W.WORKCELL_CODE=@workcellcode ");
+            sql.AppendLine("         AND W.STATE='4')  ");
+            sql.AppendLine("        OR W.WORKCELL_CODE<>@workcellcode)  ");
+            sql.AppendLine(" ORDER BY P.PLAN_DATE DESC,P.PLAN_SEQ DESC,P.PLAN_NO DESC");
+            parameters.Add(new DataParameter("workcellcode", workcellcode));
+            parameters.Add(new DataParameter("routecode", routecode));
+
+            using (var session = AppDataFactory.CreateMainSession())
+            {
+                return session.GetList<TJOrderPlan>(sql.ToString(), parameters.ToArray()).ToList();
+            }
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
index 3a9dac6..694bc23 100644
--- a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
+++ b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
@@ -222,6 +222,12 @@
     <Compile Include="Stocktaking\CountSheetInfo.cs" />
     <Compile Include="Stocktaking\Material.cs" />
     <Compile Include="Stocktaking\test.cs" />
+    <Compile Include="TianJin\TJEPasteCard.cs" />
+    <Compile Include="TianJin\TJEPasteDetailsCard.cs" />
+    <Compile Include="TianJin\TJFISORDER.cs" />
+    <Compile Include="TianJin\TJOrderPlan.cs" />
+    <Compile Include="TianJin\TJOrderPlanTrace.cs" />
+    <Compile Include="TianJin\TJWorkOrder.cs" />
     <Compile Include="View\DAIFormView.cs" />
     <Compile Include="View\PlanLabel.cs" />
     <Compile Include="WarnManage\EquipMentAlarm.cs" />
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs
new file mode 100644
index 0000000..98ad3b6
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteCard.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class TJEPasteCard
+    {
+        private string _paste_card_key;
+        /// <summary>
+        /// 贴车单主键
+        /// </summary>
+        public string PASTE_CARD_KEY
+        {
+            get { return _paste_card_key; }
+            set { _paste_card_key = value; }
+        }
+        private string _pastecardno;
+        /// <summary>
+        /// 贴车单号
+        /// </summary>
+        public string PASTECARDNO
+        {
+            get { return _pastecardno; }
+            set { _pastecardno = value; }
+        }
+        private string _pastecarddate;
+        /// <summary>
+        /// 贴车单打印时间
+        /// </summary>
+        public string PASTECARDDATE
+        {
+            get { return _pastecarddate; }
+            set { _pastecarddate = value; }
+        }
+        private string _pastecarddate2;
+        /// <summary>
+        /// 贴车单补打时间
+        /// </summary>
+        public string PASTECARDDATE2
+        {
+            get { return _pastecarddate2; }
+            set { _pastecarddate2 = value; }
+        }
+        private string _operator;
+        /// <summary>
+        /// 操作者
+        /// </summary>
+        public string OPERATOR
+        {
+            get { return _operator; }
+            set { _operator = value; }
+        }
+        private string _productionname;
+        /// <summary>
+        /// 生产线名称
+        /// </summary>
+        public string PRODUCTIONNAME
+        {
+            get { return _productionname; }
+            set { _productionname = value; }
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        private string _createtime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CREATETIME
+        {
+            get { return _createtime; }
+            set { _createtime = value; }
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        private string _plantname;
+        /// <summary>
+        /// 工作重心
+        /// </summary>
+        public string PLANTNAME
+        {
+            get { return _plantname; }
+            set { _plantname = value; }
+        }
+
+
+
+
+        /// <summary>
+        /// 贴车单明细表
+        /// </summary>
+        //private IList<EPasteDetailsCard> _DetailsCardlist;
+        /// <summary>
+        /// 贴车单明细
+        /// </summary>
+        public List<TJEPasteDetailsCard> DetailsCardlist
+        {
+            get;
+            set;
+        }
+
+        public EFailLog FailLog
+        {
+            get;
+            set;
+        }
+
+        public string VINLACK
+        {
+            get;
+            set;
+        }
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
new file mode 100644
index 0000000..6227434
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    /// <summary>
+    /// FIS发货效验明细
+    /// </summary>
+    public class TJEPasteDetailsCard
+    {
+        /// <summary>
+        /// FIS发货效验主键
+        /// </summary>
+        private string _pastedetailed_card_key;
+        /// <summary>
+        /// FIS发货效验主键
+        /// </summary>
+        public string PASTEDETAILED_CARD_KEY
+        {
+            get { return _pastedetailed_card_key; }
+            set { _pastedetailed_card_key = value; }
+        }
+        private string _fis_key;
+        /// <summary>
+        /// FIS接口表主键
+        /// </summary>
+        public string FIS_KEY
+        {
+            get { return _fis_key; }
+            set { _fis_key = value; }
+        }
+        private string _paste_card_key;
+        /// <summary>
+        /// 贴车单主键
+        /// </summary>
+        public string PASTE_CARD_KEY
+        {
+            get { return _paste_card_key; }
+            set { _paste_card_key = value; }
+        }
+        private string _sanbarcode;
+        /// <summary>
+        /// 扫描条码
+        /// </summary>
+        public string SANBARCODE
+        {
+            get { return _sanbarcode; }
+            set { _sanbarcode = value; }
+        }
+        /// <summary>
+        /// 产品主键
+        /// </summary>
+        public string PRODUCT_PID
+        {
+            get;
+            set;
+        }
+
+        private string _vwseq;
+        /// <summary>
+        /// 扫描条码
+        /// </summary>
+        public string VWSEQ
+        {
+            get { return _vwseq; }
+            set { _vwseq = value; }
+        }
+
+        /// <summary>
+        /// 条码扫描时间
+        /// </summary>
+        private string _scandate;
+        /// <summary>
+        /// 条码扫描时间
+        /// </summary>
+        public string SCANDATE
+        {
+            get { return _scandate; }
+            set { _scandate = value; }
+        }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        private string _prodno;
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string PRODNO
+        {
+            get { return _prodno; }
+            set { _prodno = value; }
+        }
+        /// <summary>
+        /// 位置
+        /// </summary>
+        private string _moulecode;
+        /// <summary>
+        /// 位置
+        /// </summary>
+        public string MOULDCODE
+        {
+            get { return _moulecode; }
+            set { _moulecode = value; }
+        }
+        /// <summary>
+        /// 总成描述
+        /// </summary>
+        private string _carsetdesc_cn;
+        /// <summary>
+        /// 总成描述
+        /// </summary>
+        public string CARSETDESC_CN
+        {
+            get { return _carsetdesc_cn; }
+            set { _carsetdesc_cn = value; }
+        }
+        /// <summary>
+        /// 底盘号
+        /// </summary>
+        private string _vin;
+        /// <summary>
+        /// 底盘号
+        /// </summary>
+        public string VIN
+        {
+            get { return _vin; }
+            set { _vin = value; }
+        }
+        /// <summary>
+        /// 上线时间
+        /// </summary>
+        private string _cp5a;
+        /// <summary>
+        /// 上线时间
+        /// </summary>
+        public string CP5A
+        {
+            get { return _cp5a; }
+            set { _cp5a = value; }
+        }
+        /// <summary>
+        /// 车型
+        /// </summary>
+        private string _lineno;
+        /// <summary>
+        /// 车型
+        /// </summary>
+        public string LINENO
+        {
+            get { return _lineno; }
+            set { _lineno = value; }
+        }
+        /// <summary>
+        /// 当前guidview行号
+        /// </summary>
+        private int _dgvrowindex;
+        /// <summary>
+        /// 当前guidview行号
+        /// </summary>
+        public int DGVROWINDEX
+        {
+            get { return _dgvrowindex; }
+            set { _dgvrowindex = value; }
+        }
+
+        public string KIN { get; set; }
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJFISORDER.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJFISORDER.cs
new file mode 100644
index 0000000..bf410ff
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJFISORDER.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using QMAPP.FJC.Entity.Basic;
+using QMAPP.Entity;
+using System.Data;
+
+
+namespace QMAPP.FJC.Entity.TianJin
+{
+    [DBTable(TableName = "T_PP_FISORDER")]
+    public class TJFISORDER
+    {
+        ///<summary>
+        ///主键
+        ///</summary>
+        [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+        public string PID { get; set; }
+
+
+        ///<summary>
+        ///VWSEQ
+        ///</summary>
+        [DBColumn(ColumnName = "VWSEQ", DataType = DbType.String)]
+        public string VWSEQ { get; set; }
+
+
+        ///<summary>
+        ///KIN
+        ///</summary>
+        [DBColumn(ColumnName = "KIN", DataType = DbType.String)]
+        public string KIN { get; set; }
+
+
+        ///<summary>
+        ///VIN
+        ///</summary>
+        [DBColumn(ColumnName = "VIN", DataType = DbType.String)]
+        public string VIN { get; set; }
+
+
+        ///<summary>
+        ///PRODNO
+        ///</summary>
+        [DBColumn(ColumnName = "PRODNO", DataType = DbType.String)]
+        public string PRODNO { get; set; }
+
+
+        ///<summary>
+        ///CARSETDESC_CN
+        ///</summary>
+        [DBColumn(ColumnName = "CARSETDESC_CN", DataType = DbType.String)]
+        public string CARSETDESC_CN { get; set; }
+
+
+
+        ///<summary>
+        ///CP5A
+        ///</summary>
+        //[DBColumn(ColumnName = "CP5A", DataType = DbType.String)]
+        //public string CP5A { get; set; }
+
+
+
+     
+
+        ///<summary>
+        ///SCANSTATE
+        ///</summary>
+        [DBColumn(ColumnName = "SCANSTATE", DataType = DbType.String)]
+        public string SCANSTATE { get; set; }
+
+        ///<summary>
+        ///LINENO
+        ///</summary>
+        [DBColumn(ColumnName = "LINENO", DataType = DbType.String)]
+        public string LINENO { get; set; }
+
+
+        ///<summary>
+        ///CREATETIME
+        ///</summary>
+        [DBColumn(ColumnName = "CREATETIME", DataType = DbType.DateTime)]
+        public DateTime CREATETIME { get; set; }
+
+
+        ///<summary>
+        ///FLAGDEL
+        ///</summary>
+        [DBColumn(ColumnName = "FLAGDEL", DataType = DbType.String)]
+        public string FLAGDEL { get; set; }
+
+
+
+
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlan.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlan.cs
new file mode 100644
index 0000000..1032966
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlan.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using System.Data;
+using QMAPP.Entity;
+
+
+namespace QMAPP.FJC.Entity.TianJin
+{
+    /// <summary>
+    /// 工单计划
+    /// </summary>
+    [DBTable(TableName = "T_PP_TJFY_ORDERPLAN", TimeStampColumn = "UPDATEDATE")]
+    public class TJOrderPlan : BaseEntity
+    {
+        ///<summary>
+        ///
+        ///</summary>
+        [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+        public string PID { get; set; }
+        
+        ///<summary>
+        ///计划单号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_NO", DataType = DbType.String)]
+        public string PLAN_NO { get; set; }
+
+
+        ///<summary>
+        ///计划顺序号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_SEQ", DataType = DbType.String)]
+        public String PLAN_SEQ { get; set; }
+
+        ///<summary>
+        ///车型
+        ///</summary>
+        [DBColumn(ColumnName = "LINENO", DataType = DbType.String)]
+        public String LINENO { get; set; }
+
+        ///<summary>
+        ///计划状态
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_STATE", DataType = DbType.String)]
+        public string PLAN_STATE { get; set; }
+        public string PLAN_STATES { get; set; }
+
+
+        ///<summary>
+        ///物料号
+        ///</summary>
+        [DBColumn(ColumnName = "MATERIAL_CODE", DataType = DbType.String)]
+        public string MATERIAL_CODE { get; set; }
+
+        ///<summary>
+        ///物料名称
+        ///</summary>
+        [DBColumn(ColumnName = "MATERIAL_NAME", DataType = DbType.String)]
+        public string MATERIAL_NAME { get; set; }
+        
+        ///<summary>
+        ///计划数量
+        ///</summary>
+        [DBColumn(ColumnName = "QTY", DataType = DbType.String)]
+        public int QTY { get; set; }
+        
+
+        ///<summary>
+        ///计划日期
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_DATE", DataType = DbType.DateTime)]
+        public DateTime PLAN_DATE { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEUSER", DataType = DbType.String)]
+        public string CREATEUSER { get; set; }
+        public string CREATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime, DefaultValue = DataDefaultValue.SysDate)]
+        public DateTime CREATEDATE { get; set; }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEUSER", DataType = DbType.String)]
+        public string UPDATEUSER { get; set; }
+        public string UPDATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)]
+        public DateTime UPDATEDATE { get; set; }
+        
+        public DateTime PLANTIMESTART { get; set; }
+
+        public DateTime PLANTIMEEND { get; set; }
+        
+        public string STARTTIMEVIEW { get; set; }
+
+        public string ENDTIMEVIEW { get; set; }
+
+        public string STARTTIMEIN { get; set; }
+
+        public string ENDTIMEIN { get; set; }
+
+        public string PLAN_DATEIN { get; set; }
+
+
+        public string AsmSetCode { get; set; }
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlanTrace.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlanTrace.cs
new file mode 100644
index 0000000..ed78826
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJOrderPlanTrace.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Data;
+using QMAPP.Entity;
+using QMAPP.FJC.Entity.FIS;
+using QMFrameWork.Data.Attributes;
+
+namespace QMAPP.FJC.Entity.FileCopy.FIS
+{
+    /// <summary>
+    /// 工单计划操作记录
+    /// </summary>
+    [DBTable(TableName = "T_PP_TJFY_ORDERPLANTRACE", TimeStampColumn = "UPDATEDATE")]
+    public class TJOrderPlanTrace : BaseEntity
+    {
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        [DBColumn(ColumnName = "OPERATE_TYPE", DataType = DbType.String)]
+        public string OPERATE_TYPE { get; set; }
+
+        ///<summary>
+        ///
+        ///</summary>
+        [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+        public string PID { get; set; }
+        
+        ///<summary>
+        ///计划单号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_NO", DataType = DbType.String)]
+        public string PLAN_NO { get; set; }
+        
+        ///<summary>
+        ///计划顺序号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_SEQ", DataType = DbType.String)]
+        public string PLAN_SEQ { get; set; }
+        
+        ///<summary>
+        ///计划状态
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_STATE", DataType = DbType.String)]
+        public string PLAN_STATE { get; set; }
+        public string PLAN_STATES { get; set; }
+        
+        ///<summary>
+        ///物料号
+        ///</summary>
+        [DBColumn(ColumnName = "MATERIAL_CODE", DataType = DbType.String)]
+        public string MATERIAL_CODE { get; set; }
+        
+        ///<summary>
+        ///计划数量
+        ///</summary>
+        [DBColumn(ColumnName = "QTY", DataType = DbType.String)]
+        public int QTY { get; set; }
+        
+        ///<summary>
+        ///计划日期
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_DATE", DataType = DbType.DateTime)]
+        public DateTime PLAN_DATE { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEUSER", DataType = DbType.String)]
+        public string CREATEUSER { get; set; }
+        public string CREATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime)]
+        public DateTime CREATEDATE { get; set; }
+        
+        public DateTime PLANTIMESTART { get; set; }
+
+        public DateTime PLANTIMEEND { get; set; }
+
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs
new file mode 100644
index 0000000..6d6ec89
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using System.Data;
+using QMAPP.Entity;
+
+namespace QMAPP.FJC.Entity.TianJin
+{
+    /// <summary>
+    ///　模块名称：派工单
+    ///　作    者：张鹏
+    ///　编写日期：2017年10月24日
+    /// </summary>
+    [DBTable(TableName = "T_PP_TJFY_WORKORDER")]
+    public class TJWorkOrder : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [DBColumn(ColumnName = "PID",DataType = DbType.String,IsKey = true)]
+        public string PID { get; set; }
+
+        /// <summary>
+        /// 订单计划ID
+        /// </summary>
+        [DBColumn(ColumnName = "ORDERPLANID",DataType = DbType.String)]
+        public string ORDERPLANID { get; set; }
+
+        /// <summary>
+        /// 订单计划号
+        /// </summary>
+        [DBColumn(ColumnName = "ORDERPLAN_NO",DataType = DbType.String)]
+        public string ORDERPLAN_NO { get; set; }
+        
+        /// <summary>
+        /// 顺序号
+        /// </summary>
+        [DBColumn(ColumnName = "SEQ", DataType = DbType.String)]
+        public  string SEQ { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        [DBColumn(ColumnName = "MATERIAL_CODE",DataType = DbType.String)]
+        public string MATERIAL_CODE { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        [DBColumn(ColumnName = "LINENO", DataType = DbType.String)]
+        public string LINENO { get; set; }
+        
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [DBColumn(ColumnName = "MATERIAL_NAME", DataType = DbType.String)]
+        public string MATERIAL_NAME { get; set; }
+
+        /// <summary>
+        /// 计划日期
+        /// </summary>
+        [DBColumn(ColumnName = "PLAN_DATE",DataType = DbType.DateTime)]
+        public  DateTime PLAN_DATE { get; set; }
+        
+        /// <summary>
+        /// 描述备注(用于保存产品条码)
+        /// </summary>
+        [DBColumn(ColumnName = "PRODUCTCODE", DataType = DbType.String)]
+        public string PRODUCTCODE { get; set; }
+        
+        /// <summary>
+        /// 模架编码
+        /// </summary>
+        [DBColumn(ColumnName = "MOULD_CODE", DataType = DbType.String)]
+        public string MOULD_CODE { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// 0：初始
+        /// 1：确认
+        /// 2：执行中
+        /// 3：完成
+        /// 4：挂起
+        /// </summary>
+        [DBColumn(ColumnName = "STATE", DataType = DbType.Int32)]
+        public  int STATE { get; set; }
+        
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)]
+        public DateTime UPDATEDATE { get; set; }
+        
+    }
+
+}
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/ProductArchivesController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/ProductArchivesController.cs
index ce158bd..dd9bf12 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/ProductArchivesController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/ProductArchivesController.cs
@@ -769,7 +769,7 @@ namespace QMAPP.FJC.Web.Controllers
             PdfWriter writer = PdfWriter.GetInstance(document, new FileStream(path + "ProductArchives.pdf", FileMode.Create));
             //设置文档的属性
             document.AddAuthor("XXX");//作者
-            document.AddCreator("XXX，富维安道拓成都数字化工厂！");
+            document.AddCreator("XXX，富维安道拓数字化工厂！");
             document.AddKeywords("PDF,存档," + txtheader);
             document.AddSubject(txtheader + "PDF文档导出存档");
             document.AddTitle(txtheader);//标题 
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
new file mode 100644
index 0000000..f12daeb
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs
@@ -0,0 +1,580 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using QMAPP.Common.Web.Controllers;
+using QMFrameWork.WebUI.Attribute;
+using QMAPP.FJC.Web.Models.TianJin;
+using QMFrameWork.Data;
+using QMAPP.ServicesAgent;
+using QMAPP.FJC.Entity.TianJin;
+using QMAPP.Entity;
+using QMFrameWork.WebUI.DataSource;
+using QMFrameWork.Common.Serialization;
+using System.Data;
+using QMAPP.Common.Web.Models;
+using QMAPP.FJC.Entity.Basic;
+using QMAPP.MD.Entity;
+using QMAPP.FJC.BLL.TianJin;
+
+namespace QMAPP.FJC.Web.Controllers
+{
+    /// <summary>
+    /// 天津门板发运计划
+    /// 作    者：张松男
+    /// 时    间：2021年12月28日
+    /// </summary>
+    public class TJDoorPlankPlanController : QController
+    {
+        #region 获取信息
+        /// <summary>
+        /// 加载列表
+        /// </summary>
+        /// <returns>结果</returns>
+        [HandleException]
+        public ActionResult List(bool? callback)
+        {
+            TJDoorPlankPlanModel seachModel = new TJDoorPlankPlanModel();
+            seachModel.PLANTIMESTART = DateTime.Now.Date.AddDays(-10).ToString("yyyy-MM-dd HH:mm:ss");
+            seachModel.PLANTIMEEND = DateTime.Now.Date.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss");
+            seachModel.ImmediateSearch = false;
+            if (callback == true)
+                TryGetSelectBuffer<TJDoorPlankPlanModel>(out seachModel);
+            seachModel.rownumbers = false;
+            seachModel.url = "/TJDoorPlankPlan/GetList";
+            return View("DoorPlankPlanList", seachModel);
+        }
+        #endregion
+
+        #region 获取列表
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="callBack">是否回调</param>
+        /// <returns>列表</returns>
+        [HandleException]
+        public ActionResult GetList(bool? callBack)
+        {
+            TJDoorPlankPlanModel seachModel = null;
+            DataPage page = null;
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            TJOrderPlan condition = null;
+            DataResult<DataPage> pageResult = new DataResult<DataPage>();
+            try
+            {
+                //获取查询对象
+                seachModel = GetModel<TJDoorPlankPlanModel>();
+                #region 获取缓存值
+                if (callBack != null)
+                {
+                    TryGetSelectBuffer<TJDoorPlankPlanModel>(out seachModel);
+                }
+                else
+                {
+                    //保存搜索条件
+                    SetSelectBuffer<TJDoorPlankPlanModel>(seachModel);
+                }
+                #endregion
+                //获取前台分页设置信息
+                page = this.GetDataPage(seachModel);
+                condition = CopyToModel<TJOrderPlan, TJDoorPlankPlanModel>(seachModel);
+                
+                #region wcf服务统一接口
+                pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("TJDoorPlankPlanBLL_GetList", condition, page);
+                if (pageResult.IsSuccess == false)
+                {
+                    SetMessage(pageResult.Msg);
+                    return List(true);
+                }
+                DateGridResult<TJOrderPlan> result = new DateGridResult<TJOrderPlan>();
+                result.Total = pageResult.Result.RecordCount;
+                result.Rows = JsonConvertHelper.GetDeserialize<List<TJOrderPlan>>(pageResult.Result.Result.ToString());
+                #endregion
+
+                return Content(result.GetJsonSource());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 编辑载入
+        /// </summary>
+        /// <returns>处理结果</returns>
+        [HandleException]
+        public ActionResult Edit()
+        {
+            TJDoorPlankPlanModel model = new TJDoorPlankPlanModel();
+            string ID = Request.Params["PID"];
+            TJOrderPlan Entity = new TJOrderPlan();
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+            try
+            {
+                if (string.IsNullOrEmpty(ID) == false)
+                {
+                    //修改获取原数据
+                    Entity.PID = ID;
+                    result = wcfAgent.InvokeServiceFunction<DataResult<TJOrderPlan>>("TJDoorPlankPlanBLL_Get", Entity);
+                    if (result.IsSuccess == false)
+                    {
+                        SetMessage(result.Msg);
+                        return View("DoorPlankPlanEdit", model);
+                    }
+                    
+                    model = CopyToModel<TJDoorPlankPlanModel, TJOrderPlan>(result.Result);
+                    
+                }
+                return View("DoorPlankPlanEdit", model);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns>处理结果</returns>
+        [HttpPost]
+        [HandleException]
+        [ValidateInput(false)]
+        public ActionResult Save(TJDoorPlankPlanModel saveModel)
+        {
+            TJOrderPlan Entity = null;
+            string TYPE = Request.Form["ORDER_TYPE"];
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                Entity = CopyToModel<TJOrderPlan, TJDoorPlankPlanModel>(saveModel);
+                if (string.IsNullOrEmpty(Entity.PID) == true)
+                {
+                    //新增
+                    //Entity.ORDER_TYPE = TYPE;
+                    result = wcfAgent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", Entity);
+                    if (result.IsSuccess == false)
+                    {
+                        SetMessage("计划单号已存在！");
+                        return View("DoorPlankPlanEdit", saveModel);
+                    }
+                }
+                else
+                {
+                    //修改
+                    result = wcfAgent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Update", Entity);
+                    if (result.IsSuccess == false)
+                    {
+                        SetMessage(result.Msg);
+                        return View("DoorPlankPlanEdit", saveModel);
+                    }
+                }
+                return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <returns>结果</returns>
+        [HttpPost]
+        [HandleException]
+        public ActionResult Delete(TJOrderPlan model)
+        {
+            string selectKey = Request.Form["selectKey"];
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<int> result = new DataResult<int>();
+            try
+            {
+                result = wcfAgent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Delete", selectKey);
+                if (result.IsSuccess == false)
+                {
+                    SetMessage(result.Msg);
+                    return List(true);
+                }
+                SetMessage(AppResource.DeleteMessage);
+                return List(true);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion                                                                                                                                                                                                                                                                                                                                                                                                                                  
+
+        #region 发布
+        /// <summary>
+        /// 发布
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [HandleException]
+        public ActionResult PutOut(TJOrderPlan model)
+        {
+            string selectKey = Request.Form["selectKey"];
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<int> result = new DataResult<int>();
+            result = wcfAgent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", selectKey);
+            if (result.IsSuccess == false)
+            {
+                SetMessage(result.Msg);
+                return List(true);
+            }
+            SetMessage(AppResource.PutOutMessage);
+            return List(true);
+        }
+        #endregion
+
+        #region 导出excel
+        /// <summary>
+        /// 导出excel
+        /// </summary>
+        /// <returns>结果</returns>
+        [HttpPost]
+        public ActionResult ExportExcel()
+        {
+            TJDoorPlankPlanModel seachModel = null;
+            TJOrderPlan condition = null;
+            DataTable exportDt = new DataTable();
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            try
+            {
+                //获取查询对象
+                seachModel = GetModel<TJDoorPlankPlanModel>();
+                condition = CopyToModel<TJOrderPlan, TJDoorPlankPlanModel>(seachModel);
+                //获取数据
+                TJDoorPlankPlanBLL dp = new TJDoorPlankPlanBLL();
+                exportDt = dp.GetExportData(condition);
+                //exportDt = wcfAgent.InvokeServiceFunction<DataTable>("DoorPlankPlanBLL_GetExportData", condition);
+
+                //导出
+                QMFrameWork.WebUI.Util.IEFileTool efTool = new QMFrameWork.WebUI.Util.IEFileTool();
+                return efTool.GetExcelFileResult("DoorPlankPlanExp", "门板计划信息.xlsx", exportDt);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 导入excel
+        /// <summary>
+        /// 导入excel
+        /// </summary>
+        /// <returns>结果</returns>
+        [HttpPost]
+        public ActionResult ImportExcel()
+        {
+            DataTable dt = null;
+            List<TJOrderPlan> list = new List<TJOrderPlan>();
+            DataResult<ImportMessage> serviceResult = null;
+            string fileName = Request.Form["fileName"];
+            string orderby = Request.Form["ORDER_TYPE"];
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+
+            Materiel materialmodel = new Materiel();
+            ProduceShift produceshiftmodel = new ProduceShift();
+            MachineInfo machine = new MachineInfo();
+            //初始工作中心编号条件
+            QMAPP.MD.Entity.WorkCell workcell = new QMAPP.MD.Entity.WorkCell();
+            workcell.WORKCELL_CODE = orderby;
+
+            try
+            {
+                dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt);
+                //格式转换
+                list = QMFrameWork.Common.Util.BindHelper.ConvertToList<TJOrderPlan>(dt).ToList();
+                serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
+                if (serviceResult.Ex != null)
+                {
+                    throw serviceResult.Ex;
+                }
+                if (serviceResult.Result.failureNum != 0)
+                {
+                    foreach (RowError error in serviceResult.Result.Errors)
+                    {
+                        dt.Rows[error.Key - 1]["InfoError"] = error.Value;
+                    }
+                    ImportMessageModel model = new ImportMessageModel();
+                    model.InfoName = "DoorPlankPlanImp";
+                    model.ReturnUrl = "/TJDoorPlankPlan/List?callBack=true";
+                    model.Message = serviceResult.Result;
+                    model.ErrorDt = dt;
+                    return new MessageOutputController().OutputImportMessage(model);
+                }
+                else
+                {
+                    SetMessage(serviceResult.Msg + "，如下：<br/>"
+                    + "插入" + serviceResult.Result.insertNum + "条，"
+                    + "更新" + serviceResult.Result.updateNum + "条"
+                    );
+                    return List(true);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                System.IO.File.Delete(MvcApplication.TempPath + fileName);
+            }
+        }
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <returns>结果</returns>
+        [HttpPost]
+        public ActionResult GetTemplate()
+        {
+            try
+            {
+                string path = AppDomain.CurrentDomain.BaseDirectory + "App_Data/Excel/";
+                string fileName = "DoorPlankPlanImp.xlsx";
+                return File(path + fileName, "application/vnd.ms-excel", Url.Encode("门板信息导入模板.xlsx"));
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        
+        
+        //#region 整车添加物料信息
+        ///// <summary>
+        ///// 编辑载入
+        ///// </summary>
+        ///// <returns>处理结果</returns>
+        //[HandleException]
+        //public ActionResult AddMaterial()
+        //{
+        //    TJDoorPlankPlanModel model = new TJDoorPlankPlanModel();
+        //    string ID = Request.Params["PID"];
+        //    string TYPE = Request.Params["ORDER_TYPE"];
+        //    TJOrderPlan Entity = new TJOrderPlan();
+        //    ServiceAgent wcfAgent = this.GetServiceAgent();
+        //    DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+        //    try
+        //    {
+        //        model.ORDER_TYPE = TYPE;
+        //        return View("AddMaterialEdit", model);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// 保存
+        ///// </summary>
+        ///// <param name="model"></param>
+        ///// <returns>处理结果</returns>
+        //[HttpPost]
+        //[HandleException]
+        //[ValidateInput(false)]
+        //public ActionResult SaveMaterial(TJDoorPlankPlanModel saveModel)
+        //{
+
+        //    Material condition = new Material();
+        //    ServiceAgent wcfAgent = this.GetServiceAgent();
+
+        //    condition.MATERIAL_CODE = saveModel.MATERIAL_CODE;
+        //    Material material = wcfAgent.InvokeServiceFunction<Material>("MaterialBLL_GetMaterialInfo", condition);
+
+        //    if (!string.IsNullOrEmpty(material.PID))
+        //    {
+        //        saveModel.MATERIAL_NAME = material.MATERIAL_NAME;
+        //        saveModel.COLOR = material.COLOR;
+        //        saveModel.HBTYPE = material.HBTYPE;
+        //        return View("AddWholeDoorEdit", saveModel);
+        //    }
+        //       return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
+        //}
+        //#endregion
+
+        #region 整车添加物料信息
+        //[HandleException]
+        //public ActionResult AddSendDetail(bool? callBack)
+        //{
+        //    //实例化服务
+        //    ServiceAgent wcfAgent = this.GetServiceAgent();
+        //    QMAPP.MD.Web.Models.MaterialModel seachModel = null;
+        //    DataResult<DataPage> pageResult = new DataResult<DataPage>();
+        //    DataPage page = new DataPage();
+        //    string Fisid = Request["MATERIAL_CODE"].ToString();
+        //    FISAssembly MaterialAssInfo = wcfAgent.InvokeServiceFunction<FISAssembly>("DoorPlankPlanBLL_GetFISMaterialInfoCD", Fisid);
+        //    string materials = "('" + MaterialAssInfo.MESModulFL + "','" + MaterialAssInfo.MESModulFR + "','" + MaterialAssInfo.MESModulRL + "','" + MaterialAssInfo.MESModulRR + "')";
+        //    //物料发货明细实体
+        //    Material detail = new Material()
+        //    {
+        //        MaterialCodes = materials,
+        //    };
+        //    try
+        //    {
+        //        //获取查询对象
+        //        seachModel = GetModel<QMAPP.MD.Web.Models.MaterialModel>();
+        //        #region 获取缓存值
+        //        if (callBack != null)
+        //        {
+        //            TryGetSelectBuffer<QMAPP.MD.Web.Models.MaterialModel>(out seachModel);
+        //        }
+        //        else
+        //        {
+        //            //保存搜索条件
+        //            SetSelectBuffer<QMAPP.MD.Web.Models.MaterialModel>(seachModel);
+        //        }
+        //        #endregion
+        //        //获取前台分页设置信息
+        //        page = this.GetDataPage(seachModel);
+        //        pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("MaterialBLL_GetList", detail, page);
+        //        if (pageResult.IsSuccess == false)
+        //        {
+        //            SetMessage(pageResult.Msg);
+        //            return List(true);
+        //        }
+        //        DateGridResult<Material> result = new DateGridResult<Material>();
+        //        result.Total = pageResult.Result.RecordCount;
+        //        result.Rows = JsonConvertHelper.GetDeserialize<List<Material>>(pageResult.Result.Result.ToString());
+        //        for (var i = 0; i < result.Total; i++)
+        //        {
+        //            result.Rows[i].AsmSetCode = MaterialAssInfo.AsmSetCode;
+        //        }
+        //            return Content(result.GetJsonSource());
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw ex;
+        //    }
+        //}
+        #endregion
+
+        #region 门板顺序号编辑
+        /// <summary>
+        /// 门板顺序号编辑
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DoorPlankEditSeq()
+        {
+            TJDoorPlankPlanModel model = new TJDoorPlankPlanModel();
+            TJOrderPlan Entity = new TJOrderPlan();
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<TJOrderPlan> result = new DataResult<TJOrderPlan>();
+            try
+            {
+                model = GetModel<TJDoorPlankPlanModel>();
+                return View("DoorPlankEditSeq", model);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion 
+
+
+        #region 获取编辑系列号列表
+        /// <summary>
+        /// 获取编辑系列号列表
+        /// </summary>
+        /// <param name="callBack"></param>
+        /// <returns></returns>
+        [HandleException]
+        public ActionResult GetDoorPlankPlanList(bool? callBack)
+        {
+            TJDoorPlankPlanModel seachModel = null;
+            DataResult<DataPage> pageResult = new DataResult<DataPage>();
+            DataPage page = new DataPage();
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            TJOrderPlan condition = new TJOrderPlan();
+            try
+            {
+                //获取查询对象
+                seachModel = GetModel<TJDoorPlankPlanModel>();
+
+                //condition.PIDList =seachModel.PIDList;
+                //condition.ORDER_TYPE = seachModel.ORDER_TYPE;
+
+                #region 获取缓存值
+                if (callBack != null)
+                {
+                    TryGetSelectBuffer<TJDoorPlankPlanModel>(out seachModel);
+                }
+                else
+                {
+                    //保存搜索条件
+                    SetSelectBuffer<TJDoorPlankPlanModel>(seachModel);
+                }
+                #endregion
+                //获取前台分页设置信息
+                page = this.GetDataPage(seachModel);
+                condition = CopyToModel<TJOrderPlan, TJDoorPlankPlanModel>(seachModel);
+
+                #region wcf服务统一接口
+                pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("DoorPlankPlanBLL_GetDoorPlankPlanList", condition, page);
+                if (pageResult.IsSuccess == false)
+                {
+                    SetMessage(pageResult.Msg);
+                    return List(true);
+                }
+                DateGridResult<TJOrderPlan> result = new DateGridResult<TJOrderPlan>();
+                result.Total = pageResult.Result.RecordCount;
+                result.Rows = JsonConvertHelper.GetDeserialize<List<TJOrderPlan>>(pageResult.Result.Result.ToString());
+                #endregion
+                return Content(result.GetJsonSource());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+         #endregion
+
+        #region 保存顺序号修改
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns>处理结果</returns>
+        [HttpPost]
+        [HandleException]
+        [ValidateInput(false)]
+        public ActionResult DoorPlankPlanSeqSave(TJDoorPlankPlanModel saveModel)
+        {
+            TJOrderPlan entity = new TJOrderPlan();
+            ServiceAgent wcfAgent = this.GetServiceAgent();
+            DataResult<int> result = new DataResult<int>();
+
+            entity.PLAN_SEQ = saveModel.PLAN_SEQ;
+            //entity.PIDList = saveModel.PIDList;
+
+            entity = CopyToModel<TJOrderPlan, TJDoorPlankPlanModel>(saveModel);
+            
+            //修改
+            result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_UpdateDoorPlankPlanSeq", entity);
+
+            return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
+        }
+        #endregion
+    }
+}
diff --git a/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
new file mode 100644
index 0000000..4b47c8c
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc.Html;
+using QMFrameWork.WebUI.Attribute;
+using QMFrameWork.WebUI;
+
+namespace QMAPP.FJC.Web.Models.TianJin
+{
+    public class TJDoorPlankPlanModel:QDGModel
+    {
+        ///<summary>
+        ///主键
+        ///</summary>
+        [Description("主键")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 36)]
+        [InputType(inputType.text)]
+        [DGColumn(Hidden = true, PrimaryKey = true)]
+        public string PID { get; set; }
+        
+        ///<summary>
+        ///计划单号
+        ///</summary>
+        [Description("计划单号")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30,Width = 200)]
+        [InputType(inputType.text)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
+        public string PLAN_NO { get; set; }
+
+        ///<summary>
+        ///计划顺序号
+        ///</summary>
+        [Description("计划顺序号")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
+        [InputType(inputType.text)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
+        public string PLAN_SEQ { get; set; }
+
+        ///<summary>
+        ///车型
+        ///</summary>
+        [Description("车型")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
+        [InputType(inputType.text)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
+        public string LINENO { get; set; }
+        
+        ///<summary>
+        ///计划状态
+        ///</summary>
+        [Description("计划状态")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
+        [InputType(inputType.combobox)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
+        public string PLAN_STATE { get; set; }
+
+        ///<summary>
+        ///物料号
+        ///</summary>
+        [Description("物料号")]
+        [HTMLInput(UpdateRead = false, required = true, Width = 200, MaxLength = 30)]
+        [InputType(inputType.combotree)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 130, DataAlign = DataAlign.center)]
+        public string MATERIAL_CODE { get; set; }
+        
+        ///<summary>
+        ///物料名称
+        ///</summary>
+        [Description("物料名称")]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 240, DataAlign = DataAlign.center)]
+        public string MATERIAL_NAME { get; set; }
+        
+        ///<summary>
+        ///计划数量
+        ///</summary>
+        [Description("计划数量")]
+        [HTMLInput(UpdateRead = false, Width = 196, required = true, MaxLength = 30)]
+        [InputType(inputType.text)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
+        public string QTY { get; set; }
+        
+        ///<summary>
+        ///备注
+        ///</summary>
+        [Description("备注")]
+        [HTMLInput(UpdateRead = false, Width = 196, MaxLength = 30)]
+        [InputType(inputType.textArea)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 120, DataAlign = DataAlign.center)]
+        public string REMARK { get; set; }
+
+        ///<summary>
+        ///计划日期
+        ///</summary>
+        [Description("计划日期")]
+        [HTMLInput(UpdateRead = true, required = true, Width = 200, MaxLength = 30)]
+        [InputType(inputType.datebox)]
+        [DGColumn(frozenColumns = false, Sortable = true, Width = 150, DataAlign = DataAlign.center)]
+        public DateTime PLAN_DATE { get; set; }
+
+        [Description("计划日期")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 7, Width = 200, FormatDate = "yyyy-MM-dd HH:mm:ss")]
+        [InputType(inputType.dateTimeBox)]
+        public string PLANTIMESTART { get; set; }
+
+        [Description("至")]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 7, Width = 200, FormatDate = "yyyy-MM-dd HH:mm:ss")]
+        [InputType(inputType.dateTimeBox)]
+        public string PLANTIMEEND { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Description("创建用户")]
+        public string CREATEUSER { get; set; }
+
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Description("创建用户")]
+        [DGColumn(Sortable = true, Width = 100, DataAlign = DataAlign.left)]
+        public string CREATEUSERNAME { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Description("创建时间")]
+        [HTMLInput(UpdateRead = true, MaxLength = 20)]
+        [InputType(inputType.hidden)]
+        [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")]
+        public DateTime CREATEDATE { get; set; }
+        
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        [Description("物料号")]
+        public string MaterialCodes { get; set; }
+        
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
index ef211b6..cc6598e 100644
--- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
+++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
@@ -229,6 +229,7 @@
     <Compile Include="Controllers\ProductOutController.cs" />
     <Compile Include="Controllers\QualifiedRateController.cs" />
     <Compile Include="Controllers\RawMaterialController.cs" />
+    <Compile Include="Controllers\TJDoorPlankPlanController.cs" />
     <Compile Include="Controllers\TSWeighRecoreController.cs" />
     <Compile Include="Controllers\RawMaterialRecordController.cs" />
     <Compile Include="Controllers\ScrapRecordController.cs" />
@@ -361,6 +362,7 @@
     <Compile Include="Models\Stocktaking\CountResultModel.cs" />
     <Compile Include="Models\Stocktaking\CountSheetModel.cs" />
     <Compile Include="Models\Stocktaking\StocktakingSearchModel.cs" />
+    <Compile Include="Models\TianJin\TJDoorPlankPlanModel.cs" />
     <Compile Include="Models\WarnManage\EquipMentAlarmModel.cs" />
     <Compile Include="Models\WarnManage\EquipMentMaintainModel.cs">
       <SubType>Code</SubType>
@@ -900,6 +902,8 @@
     <Content Include="Views\AppConfig\AppConfigList.aspx" />
     <Content Include="Views\BucketMaterialClass\BucketMaterialClassEdit.aspx" />
     <Content Include="Views\BucketMaterialClass\BucketMaterialClassList.aspx" />
+    <Content Include="Views\TJDoorPlankPlan\DoorPlankPlanEdit.aspx" />
+    <Content Include="Views\TJDoorPlankPlan\DoorPlankPlanList.aspx" />
     <Content Include="Views\TSWeighRecore\TSWeighRecoreList.aspx" />
     <Content Include="Views\RawMaterialRecord\RawMaterialRecordEdit.aspx" />
     <Content Include="Views\RawMaterialRecord\RawMaterialRecordList.aspx" />
diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanEdit.aspx
new file mode 100644
index 0000000..6a7cfd2
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanEdit.aspx
@@ -0,0 +1,106 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
+    Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.TianJin.TJDoorPlankPlanModel>" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+    门板订单计划信息编辑
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+    <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%>
+    <%
+        var editable = false;
+        if (string.IsNullOrEmpty(Model.PLAN_STATE) || string.Equals(Model.PLAN_STATE, "0"))
+        {
+            editable = true;
+        } 
+    %>
+    <table id="editTable" cellpadding="0" cellspacing="0">
+        <tr>
+            <td>
+                <table>
+                    <tr>
+                        <th align="right">
+                            <%=Html.QV(p => p.PLAN_DATE)%>
+                        </th>
+                        <td>
+                            <input id="PLAN_DATE" name="PLAN_DATE"  value="<%=string.IsNullOrEmpty(Model.PID)?DateTime.Now.ToString("yyyy-MM-dd"):Model.PLAN_DATE.ToString("yyyy-MM-dd HH:mm:ss") %>"
+                              style=" width:200px"  type="text" class="easyui-datebox" required="required" <%=editable?"":"readonly =\"readonly\"" %> />
+                        </td>
+                    </tr>
+                    
+                    <tr>
+                        <th align="right">
+                            <%=Html.QV(p => p.MATERIAL_CODE)%>
+                        </th>
+                        <td>
+                            <%=Html.QC(p => p.MATERIAL_CODE, editable ? null : new { Readonly = "readonly" })%>
+                            <script type="text/javascript" language="javascript">
+                               
+                            </script>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th align="right">
+                            <%=Html.QV(p => p.QTY)%>
+                        </th>
+                        <td>
+                            <%=Html.QC(p => p.QTY)%>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th align="right">
+                            <%=Html.QV(p => p.LINENO)%>
+                        </th>
+                        <td>
+                            <%=Html.QC(p => p.LINENO)%>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th align="right">
+                            <%=Html.QV(p => p.REMARK)%>
+                        </th>
+                        <td>
+                            <%=Html.QC(p => p.REMARK)%>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+    <%=Html.HiddenFor(p=>p.PID) %>
+    <%=Html.HiddenFor(p=>p.CREATEDATE) %>
+    <%=Html.HiddenFor(p=>p.CREATEUSER) %>
+    <%=Html.HiddenFor(p => p.PLAN_STATE)%>
+    <%=Html.HiddenFor(p => p.PLAN_NO)%>
+    <%=Html.QPEnd() %>
+</asp:Content>
+<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
+    <table width="100%" cellpadding="0" cellspacing="0">
+        <tr>
+            <td>
+                <%=Html.QTButtonSave("User", "Save", "return Save();")%>
+                <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%>
+            </td>
+        </tr>
+    </table>
+    <script type="text/javascript">
+        $(function () {
+            //获取物料下拉数据源
+            $('#MATERIAL_CODE').combotree({
+                url: "/Dict/GetFisMaterialTree?ordertype=",
+                panelHeight: '230',
+                panelWidth: '470',
+            });
+        });
+        function Save() {
+
+            var reg = /^[0-9]+$/;
+            var netId = $("#QTY").val();
+            if (!reg.test(netId)) {
+                MSI("提示", "计划数量只能输入数字。");
+                return;
+            }
+            
+            submitByButton("Save");
+        }
+    </script>
+</asp:Content>
diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
new file mode 100644
index 0000000..448c090
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx
@@ -0,0 +1,191 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" 
+              Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.TianJin.TJDoorPlankPlanModel>" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+	订单生产计划列表
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+     <%=Html.QPSeach(80, true)%>
+    <table id="condiTable">
+        <tr>
+            <th align="right">
+                <%=Html.QV(p => p.PLAN_NO)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.PLAN_NO)%> 
+            </td>
+            <th align="right">
+                <%=Html.QV(p => p.MATERIAL_CODE)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.MATERIAL_CODE)%> 
+            </td>
+            <th align="right">
+                <%=Html.QV(p => p.PLANTIMESTART)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.PLANTIMESTART)%>
+            </td>
+            <th align="right">
+                <%=Html.QV(p => p.PLANTIMEEND)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.PLANTIMEEND)%>
+            </td>
+        </tr>
+        
+    </table>
+    <%=Html.QPEnd()%>
+    <%=Html.QPList() %>
+    <%=Html.QDateGrid<QMAPP.FJC.Web.Models.TianJin.TJDoorPlankPlanModel>(Model)%>
+    <%=Html.QPEnd() %>
+    <%=Html.Hidden("selectKey")%>
+    <%=Html.Hidden("fileName")%>
+    <%=Html.Hidden("ORDER_TYPE")%>
+    <script language="javascript" type="text/javascript">
+        $(function () {
+            var type = document.getElementById("ORDER_TYPE").value;
+            //获取物料下拉数据源
+            $('#MATERIAL_CODE').combotree({
+                url: "/Dict/GetFisMaterialTree?ordertype=" + type,
+                panelHeight: '250',
+                panelWidth: '500',
+            });
+            List(1);
+        });
+        //添加
+        function Add() {
+            openAppWindow1('信息添加', 'Edit', '500', '400');
+        }
+
+        //整车添加
+        function AddWholeDoor() {
+            var type = document.getElementById("ORDER_TYPE").value;
+            openAppWindow1('整车添加门板', 'AddWholeDoor?ORDER_TYPE=' + type, '650', '380');
+        }
+        //修改
+        function Update() {
+            var ids = getSelectKey();
+            if (ids == "") {
+                MSI("提示", "请选择修改记录。");
+                return;
+            }
+            if (ids.indexOf(":") > 0) {
+                MSI("提示", "每次只能修改一条记录。");
+                return;
+            }
+            openAppWindow1('修改', 'Edit?PID=' + ids, '500', '400');
+        }
+        //插单
+        function Insert() {
+            var ids = getSelectKey();
+            if (ids == "") {
+                MSI("提示", "请选择一条FIS计划作为插单位置。");
+                return;
+            }
+            if (ids.indexOf(":") > 0) {
+                MSI("提示", "只能选择一条FIS计划作为插单位置。");
+                return;
+            }
+            document.getElementById("selectKey").value = ids;
+            var type = document.getElementById("ORDER_TYPE").value;
+            openAppWindow1('插单', 'Insert?PID=' + ids + "&ORDER_TYPE=" + type, '650', '380');
+        }
+        //删除
+        function Delete() {
+            var ids = getSelectKey();
+            if (ids == "") {
+                MSI("错误", "至少选择一条记录");
+            }
+            else {
+                document.getElementById("selectKey").value = ids;
+                MSQ("提示", "确定要删除选中的记录吗？", function () {
+                    submitByButton("Delete");
+                })
+            }
+        }
+        //导入
+        function Import() {
+            var fileName = window.showModalDialog("/File/UploadFile", "", "dialogHeight: 200px; dialogWidth: 300px; center: Yes; help: Yes;status: Yes;");
+            if (fileName == null)
+                return;
+            document.getElementById("fileName").value = fileName;
+            //处理等待
+            submitByButton("ImportExcel");
+        }
+        //导出
+        function Export() {
+            document.getElementById("selectKey").value = getSelectKey();
+            submitByButton("ExportExcel");
+        }
+        //下载模板
+        function getTemplate() {
+            submitByButton("GetTemplate");
+        }
+        //查询
+        function Search() {
+            var endtime = document.getElementById("PLANTIMEEND").value;
+            if (parseDate($("#PLANTIMESTART").val()) > parseDate($("#PLANTIMEEND").val()) && endtime != "") {
+                alert("开始时间不能大于结束时间！");
+                return;
+            }
+            List(1)
+        }
+        //发布
+        function Publish() {
+            var ids = getSelectKey();
+            if (ids == "") {
+                MSI("错误", "至少选择一条记录");
+            }
+            else {
+                document.getElementById("selectKey").value = ids;
+                MSQ("提示", "确定要发布选中的记录吗？", function () {
+                    submitByButton("PutOut");
+                })
+            }
+        }
+
+        //修改计划顺序
+        function EditDoorPlankPlanSeq() {
+          var ids = getSelectKey();
+            if (ids == "") {
+                MSI("错误", "至少选择一条记录");
+                return;
+            }
+          document.getElementById("selectKey").value = ids;
+          var type = document.getElementById("ORDER_TYPE").value;
+          openAppWindow1('修改门板计划顺序号', 'DoorPlankEditSeq?PIDList=' + ids+ "&ORDER_TYPE=" + type, '690', '400');
+        }
+        $(function () {
+
+            $('#FACTORY_CODE').combobox({
+                panelWidth: '350'
+
+            });
+
+        });
+
+</script>
+</asp:Content>
+
+<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
+    <table cellpadding="0" cellspacing="0">
+        <tr>
+            <td align="center">
+                <%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%>
+                <%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>
+               <%-- <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%>
+                <%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> 
+               <%-- <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> 
+                <%=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)%> --%>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
+
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index a991bcb..eb4111c 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -31,7 +31,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=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.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+
+
+    <!--<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.99;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>-->
   </connectionStrings>
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 7ae6ef7..bfbcc5a 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -4,10 +4,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="maindbBZD" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=BZD;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
-    
-    
-    <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+
+    <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.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
 
   </connectionStrings>
 
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
new file mode 100644
index 0000000..dbe5a8a
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
@@ -0,0 +1,9 @@
+LINENO	String	100	
+PRODUCTIONNAME	String	100	
+ROWINDEX	String	100	
+VWSEQ	String	100	
+VIN	String	100	
+PRODNO	String	100	
+CARSETDESCCN	String	100	
+PASTECARDNO	String	100	
+SCANDATE	String	100	
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.cs
new file mode 100644
index 0000000..e0687c1
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    public partial class TJDefaultDataSetNum : Form
+    {
+        public TJDefaultDataSetNum()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// 设置
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSet_Click(object sender, EventArgs e)
+        {
+            if (txtDataSetNum.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("设置的值不允许为空！");
+            }
+            else
+            {
+                //QM.Config.CustomConfig.SetItem("ShowDataCount", txtDataSetNum.Text);
+                QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount"] = txtDataSetNum.Text;
+                QMAPP.WinForm.Common.LocalSetting.Settings["RowCount"] = txtRowCount.Text;
+                
+                MessageBox.Show("设置成功！");
+                TJFrmPlace fplace = (TJFrmPlace)this.Owner;
+                fplace.GetInitData();
+                fplace.InitContainer();
+                this.Close();
+            }
+        }
+
+        private void txtDataSetNum_KeyPress(object sender, KeyPressEventArgs e)
+        {
+           
+            if (e.KeyChar != '\b' && !Char.IsDigit(e.KeyChar))
+            {
+                e.Handled = true;
+            }
+
+        }
+
+        private void DefaultDataSetNum_Load(object sender, EventArgs e)
+        {
+            //txtDataSetNum.Text = QM.Config.CustomConfig.GetItem("ShowDataCount");
+            txtDataSetNum.Text = QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount"];
+            txtRowCount.Text = QMAPP.WinForm.Common.LocalSetting.Settings["RowCount"];
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.designer.cs
new file mode 100644
index 0000000..e098385
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.designer.cs
@@ -0,0 +1,109 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJDefaultDataSetNum
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtDataSetNum = new System.Windows.Forms.TextBox();
+            this.btnSet = new System.Windows.Forms.Button();
+            this.txtRowCount = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(12, 22);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(53, 12);
+            this.label4.TabIndex = 11;
+            this.label4.Text = "器具容量";
+            // 
+            // txtDataSetNum
+            // 
+            this.txtDataSetNum.Location = new System.Drawing.Point(71, 19);
+            this.txtDataSetNum.MaxLength = 3;
+            this.txtDataSetNum.Name = "txtDataSetNum";
+            this.txtDataSetNum.Size = new System.Drawing.Size(124, 21);
+            this.txtDataSetNum.TabIndex = 12;
+            this.txtDataSetNum.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtDataSetNum_KeyPress);
+            // 
+            // btnSet
+            // 
+            this.btnSet.Location = new System.Drawing.Point(212, 18);
+            this.btnSet.Name = "btnSet";
+            this.btnSet.Size = new System.Drawing.Size(75, 23);
+            this.btnSet.TabIndex = 17;
+            this.btnSet.Text = "设置";
+            this.btnSet.UseVisualStyleBackColor = true;
+            this.btnSet.Click += new System.EventHandler(this.btnSet_Click);
+            // 
+            // txtRowCount
+            // 
+            this.txtRowCount.Location = new System.Drawing.Point(71, 46);
+            this.txtRowCount.MaxLength = 3;
+            this.txtRowCount.Name = "txtRowCount";
+            this.txtRowCount.Size = new System.Drawing.Size(124, 21);
+            this.txtRowCount.TabIndex = 19;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(12, 49);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 18;
+            this.label1.Text = "器具层数";
+            // 
+            // DefaultDataSetNum
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(298, 91);
+            this.Controls.Add(this.txtRowCount);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.btnSet);
+            this.Controls.Add(this.txtDataSetNum);
+            this.Controls.Add(this.label4);
+            this.Name = "DefaultDataSetNum";
+            this.Text = "设置发运器具容量";
+            this.Load += new System.EventHandler(this.DefaultDataSetNum_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtDataSetNum;
+        private System.Windows.Forms.Button btnSet;
+        private System.Windows.Forms.TextBox txtRowCount;
+        private System.Windows.Forms.Label label1;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJDefaultDataSetNum.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.cs
new file mode 100644
index 0000000..fe8e315
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using Model;
+using DCS.Place;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    public partial class TJFrmCarCardDetail : Form
+    {
+        public TJFrmCarCardDetail()
+        {
+            InitializeComponent();
+        }
+        private string pasterkey = "";
+        public TJFrmCarCardDetail(string pastecardkey)
+        {
+            pasterkey = pastecardkey;
+            InitializeComponent();
+        }
+        EPasteCard pastecard;
+        string ptroducttype = "";
+        string printtype = "";
+        public bool isprint = false;
+        public TJFrmCarCardDetail(EPasteCard ppaste, string pstrprodtype, string pprinttype)
+        {
+            printtype = pprinttype;
+            pastecard = ppaste;
+            ptroducttype = pstrprodtype;
+            InitializeComponent();
+
+        }
+        public void getdate()
+        {
+            dgvMat.DataMember = null;
+            dgvMat.DataSource = pastecard.DetailsCardlist;
+        }
+        
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmCarCardPrintShow_Load(object sender, EventArgs e)
+        {
+            #region
+            try
+            {
+                //btnPrint.Enabled = true;
+                if (printtype == "手动")
+                {
+                    ITEMNO.Visible = false;
+                    getdate();
+                }
+                else
+                {
+                    QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                    DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), pasterkey);
+                    dgvMat.DataSource = tbl;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            #endregion
+        }
+
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs
new file mode 100644
index 0000000..f8f624b
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.designer.cs
@@ -0,0 +1,281 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJFrmCarCardDetail
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tcEmployee = new System.Windows.Forms.TabControl();
+            this.tpPrint = new System.Windows.Forms.TabPage();
+            this.dgvMat = new System.Windows.Forms.DataGridView();
+            this.tsslbl_Message = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.ITEMNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PASTECARDNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.VIN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CP5A = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LINENO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tcEmployee.SuspendLayout();
+            this.tpPrint.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMat)).BeginInit();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tcEmployee
+            // 
+            this.tcEmployee.Controls.Add(this.tpPrint);
+            this.tcEmployee.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tcEmployee.Location = new System.Drawing.Point(0, 0);
+            this.tcEmployee.Name = "tcEmployee";
+            this.tcEmployee.SelectedIndex = 0;
+            this.tcEmployee.Size = new System.Drawing.Size(789, 482);
+            this.tcEmployee.TabIndex = 67;
+            // 
+            // tpPrint
+            // 
+            this.tpPrint.Controls.Add(this.dgvMat);
+            this.tpPrint.Location = new System.Drawing.Point(4, 22);
+            this.tpPrint.Name = "tpPrint";
+            this.tpPrint.Padding = new System.Windows.Forms.Padding(3);
+            this.tpPrint.Size = new System.Drawing.Size(781, 456);
+            this.tpPrint.TabIndex = 0;
+            this.tpPrint.Text = "贴车单";
+            this.tpPrint.UseVisualStyleBackColor = true;
+            // 
+            // dgvMat
+            // 
+            this.dgvMat.AllowUserToAddRows = false;
+            this.dgvMat.AllowUserToDeleteRows = false;
+            this.dgvMat.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvMat.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ITEMNO,
+            this.PASTECARDNO,
+            this.VIN,
+            this.Column1,
+            this.CODE,
+            this.NAME,
+            this.CP5A,
+            this.Column2,
+            this.LINENO,
+            this.Column4,
+            this.Column5,
+            this.Column6,
+            this.Column7,
+            this.Column8,
+            this.Column10,
+            this.Column11});
+            this.dgvMat.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvMat.Location = new System.Drawing.Point(3, 3);
+            this.dgvMat.Name = "dgvMat";
+            this.dgvMat.RowTemplate.Height = 23;
+            this.dgvMat.Size = new System.Drawing.Size(775, 450);
+            this.dgvMat.TabIndex = 1;
+            // 
+            // tsslbl_Message
+            // 
+            this.tsslbl_Message.Name = "tsslbl_Message";
+            this.tsslbl_Message.Size = new System.Drawing.Size(0, 17);
+            // 
+            // statusStrip
+            // 
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsslbl_Message});
+            this.statusStrip.Location = new System.Drawing.Point(0, 482);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(789, 22);
+            this.statusStrip.TabIndex = 68;
+            this.statusStrip.Text = "statusStrip1";
+            // 
+            // ITEMNO
+            // 
+            this.ITEMNO.DataPropertyName = "ROWINDEX";
+            this.ITEMNO.HeaderText = "序号";
+            this.ITEMNO.Name = "ITEMNO";
+            this.ITEMNO.Visible = false;
+            this.ITEMNO.Width = 60;
+            // 
+            // PASTECARDNO
+            // 
+            this.PASTECARDNO.DataPropertyName = "PASTECARDNO";
+            this.PASTECARDNO.HeaderText = "运单号";
+            this.PASTECARDNO.Name = "PASTECARDNO";
+            // 
+            // VIN
+            // 
+            this.VIN.DataPropertyName = "VIN";
+            this.VIN.HeaderText = "绑定计划";
+            this.VIN.Name = "VIN";
+            this.VIN.ReadOnly = true;
+            this.VIN.Width = 200;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "VWSEQ";
+            this.Column1.HeaderText = "顺序号";
+            this.Column1.Name = "Column1";
+            // 
+            // CODE
+            // 
+            this.CODE.DataPropertyName = "PRODNO";
+            this.CODE.HeaderText = "零件号";
+            this.CODE.Name = "CODE";
+            this.CODE.ReadOnly = true;
+            this.CODE.Width = 150;
+            // 
+            // NAME
+            // 
+            this.NAME.DataPropertyName = "CARSETDESC_CN";
+            this.NAME.HeaderText = "总成描述";
+            this.NAME.Name = "NAME";
+            this.NAME.ReadOnly = true;
+            // 
+            // CP5A
+            // 
+            this.CP5A.DataPropertyName = "CP5A";
+            this.CP5A.HeaderText = "位置";
+            this.CP5A.Name = "CP5A";
+            this.CP5A.ReadOnly = true;
+            this.CP5A.Width = 120;
+            // 
+            // Column2
+            // 
+            this.Column2.DataPropertyName = "KIN";
+            this.Column2.HeaderText = "Column2";
+            this.Column2.Name = "Column2";
+            this.Column2.Visible = false;
+            // 
+            // LINENO
+            // 
+            this.LINENO.DataPropertyName = "LINENO";
+            this.LINENO.HeaderText = "车型";
+            this.LINENO.Name = "LINENO";
+            // 
+            // Column4
+            // 
+            this.Column4.DataPropertyName = "SANBARCODE";
+            this.Column4.HeaderText = "Column4";
+            this.Column4.Name = "Column4";
+            this.Column4.Visible = false;
+            // 
+            // Column5
+            // 
+            this.Column5.DataPropertyName = "SCANDATE";
+            this.Column5.HeaderText = "Column5";
+            this.Column5.Name = "Column5";
+            this.Column5.Visible = false;
+            // 
+            // Column6
+            // 
+            this.Column6.DataPropertyName = "PASTEDETAILED_CARD_KEY";
+            this.Column6.HeaderText = "Column6";
+            this.Column6.Name = "Column6";
+            this.Column6.Visible = false;
+            // 
+            // Column7
+            // 
+            this.Column7.DataPropertyName = "FIS_KEY";
+            this.Column7.HeaderText = "Column7";
+            this.Column7.Name = "Column7";
+            this.Column7.Visible = false;
+            // 
+            // Column8
+            // 
+            this.Column8.DataPropertyName = "PASTE_CARD_KEY";
+            this.Column8.HeaderText = "Column8";
+            this.Column8.Name = "Column8";
+            this.Column8.Visible = false;
+            // 
+            // Column10
+            // 
+            this.Column10.DataPropertyName = "PRODUCTIONNAME";
+            this.Column10.HeaderText = "Column10";
+            this.Column10.Name = "Column10";
+            this.Column10.Visible = false;
+            // 
+            // Column11
+            // 
+            this.Column11.DataPropertyName = "DGVROWINDEX";
+            this.Column11.HeaderText = "Column11";
+            this.Column11.Name = "Column11";
+            this.Column11.Visible = false;
+            // 
+            // TJFrmCarCardDetail
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(789, 504);
+            this.Controls.Add(this.tcEmployee);
+            this.Controls.Add(this.statusStrip);
+            this.Name = "TJFrmCarCardDetail";
+            this.Text = "贴车单明细";
+            this.Load += new System.EventHandler(this.FrmCarCardPrintShow_Load);
+            this.tcEmployee.ResumeLayout(false);
+            this.tpPrint.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMat)).EndInit();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tcEmployee;
+        private System.Windows.Forms.TabPage tpPrint;
+        private System.Windows.Forms.DataGridView dgvMat;
+        private System.Windows.Forms.ToolStripStatusLabel tsslbl_Message;
+        private System.Windows.Forms.StatusStrip statusStrip;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ITEMNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PASTECARDNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn VIN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CP5A;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LINENO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx
new file mode 100644
index 0000000..da28a40
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardDetail.resx
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ITEMNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PASTECARDNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="VIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CP5A.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LINENO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs
new file mode 100644
index 0000000..5eeaa6f
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using Model;
+using DCS.Place;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    public partial class TJFrmCarCardPrintShow : Form
+    {
+        public TJFrmCarCardPrintShow()
+        {
+            InitializeComponent();
+        }
+        private string pasterkey = "";
+        public TJFrmCarCardPrintShow(string pastecardkey)
+        {
+            pasterkey = pastecardkey;
+            InitializeComponent();
+        }
+        TJEPasteCard pastecard;
+        string ptroducttype = "";
+        string printtype = "";
+        public bool isprint = false;
+        public TJFrmCarCardPrintShow(TJEPasteCard ppaste, string pstrprodtype, string pprinttype)
+        {
+            printtype = pprinttype;
+            pastecard = ppaste;
+            ptroducttype = pstrprodtype;
+            InitializeComponent();
+
+        }
+        public void getdate()
+        {
+            dgvMat.DataMember = null;
+            dgvMat.DataSource = pastecard.DetailsCardlist;
+        }
+        /// <summary>
+        /// 打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnPrint_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (printtype == "手动")
+                {
+                    PrintPasteCard prin = new PrintPasteCard();
+
+
+                    DataTable dt = new DataTable();
+                    dt.Columns.Add("ROWINDEX");
+                    dt.Columns.Add("VWSEQ");
+                    dt.Columns.Add("VIN");
+                    dt.Columns.Add("PRODNO");
+                    dt.Columns.Add("CARSETDESCCN");
+                    dt.Columns.Add("CP5A");
+                    dt.Columns.Add("PASTECARDNO");
+                    dt.Columns.Add("SCANDATE");
+                    dt.Columns.Add("PRODUCTIONNAME");
+                    dt.Columns.Add("LINENO");
+                    int index = 1;
+
+                    QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                    DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardDeatis.ToString());
+
+
+                    for (var i = 0; i < dgvMat.Rows.Count; i++)
+                    {
+                        DataRow ncsdr = dt.NewRow();
+                        ncsdr["ROWINDEX"] = index.ToString(); ;
+                        ncsdr["VWSEQ"] = pastecard.DetailsCardlist[i].VWSEQ;
+                        ncsdr["VIN"] = pastecard.DetailsCardlist[i].VIN;
+                        ncsdr["PRODNO"] = pastecard.DetailsCardlist[i].PRODNO;
+                        ncsdr["CARSETDESCCN"] = pastecard.DetailsCardlist[i].CARSETDESC_CN;
+                        ncsdr["CP5A"] = pastecard.DetailsCardlist[i].CP5A;
+                        //ncsdr["PASTECARDNO"] = pastecard.PLANTNAME+pastecard.PASTECARDNO;
+                        ncsdr["SCANDATE"] = pastecard.DetailsCardlist[i].SCANDATE;
+                        ncsdr["PRODUCTIONNAME"] = ptroducttype;
+                        ncsdr["LINENO"] = pastecard.DetailsCardlist[i].LINENO;
+                        dt.Rows.Add(ncsdr);
+                        index++;
+                    }
+                    prin.Print(dt);
+                }
+                else
+                {
+                    PrintPasteCard prin = new PrintPasteCard();
+
+                    DataTable dt = (DataTable)dgvMat.DataSource;
+                    prin.Print(dt);
+                }
+                isprint = true;
+                this.label1.Text = "消息提示：打印完成";
+                this.tsslblMessage.Text = "消息提示：打印完成";
+                btnPrint.Enabled = false;
+                this.Close();
+                TJFrmPlace fplace = (TJFrmPlace)this.Owner;
+                fplace.GetInitData();
+                fplace.GetInitData2();
+                //fplace.dgvNF.DataSource = new List<EPasteDetailsCard>();
+                //nfpastecard = null;
+                //nflist = null;
+                //nfindex = 0;
+                //dgvrowindex = 0;
+
+            }
+            catch (Exception ex)
+            {
+                isprint = false;
+                btnPrint.Enabled = true;
+                MessageBox.Show("打印失败！");
+            }
+        }
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            #region
+            try
+            {
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            #endregion
+        }
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmCarCardPrintShow_Load(object sender, EventArgs e)
+        {
+            #region
+            try
+            {
+                btnPrint.Enabled = true;
+                if (printtype == "手动")
+                {
+                    ITEMNO.Visible = false;
+                    getdate();
+                }
+                else
+                {
+                    QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                    DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPasteDetails.ToString(), pasterkey);
+                    dgvMat.DataSource = tbl;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            #endregion
+        }
+
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.designer.cs
new file mode 100644
index 0000000..291a8fb
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.designer.cs
@@ -0,0 +1,345 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJFrmCarCardPrintShow
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tcEmployee = new System.Windows.Forms.TabControl();
+            this.tpPrint = new System.Windows.Forms.TabPage();
+            this.dgvMat = new System.Windows.Forms.DataGridView();
+            this.ITEMNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.VIN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnPrint = new System.Windows.Forms.Button();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.tsslbl_Message = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.tsslblMessage = new System.Windows.Forms.ToolStripStatusLabel();
+            this.tcEmployee.SuspendLayout();
+            this.tpPrint.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMat)).BeginInit();
+            this.panel1.SuspendLayout();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tcEmployee
+            // 
+            this.tcEmployee.Controls.Add(this.tpPrint);
+            this.tcEmployee.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tcEmployee.Location = new System.Drawing.Point(0, 0);
+            this.tcEmployee.Name = "tcEmployee";
+            this.tcEmployee.SelectedIndex = 0;
+            this.tcEmployee.Size = new System.Drawing.Size(789, 431);
+            this.tcEmployee.TabIndex = 67;
+            // 
+            // tpPrint
+            // 
+            this.tpPrint.Controls.Add(this.dgvMat);
+            this.tpPrint.Location = new System.Drawing.Point(4, 22);
+            this.tpPrint.Name = "tpPrint";
+            this.tpPrint.Padding = new System.Windows.Forms.Padding(3);
+            this.tpPrint.Size = new System.Drawing.Size(781, 405);
+            this.tpPrint.TabIndex = 0;
+            this.tpPrint.Text = "贴车单";
+            this.tpPrint.UseVisualStyleBackColor = true;
+            // 
+            // dgvMat
+            // 
+            this.dgvMat.AllowUserToAddRows = false;
+            this.dgvMat.AllowUserToDeleteRows = false;
+            this.dgvMat.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMat.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvMat.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ITEMNO,
+            this.Column1,
+            this.VIN,
+            this.CODE,
+            this.NAME,
+            this.CREATETIME,
+            this.Column2,
+            this.Column3,
+            this.Column4,
+            this.Column5,
+            this.Column6,
+            this.Column7,
+            this.Column8,
+            this.Column9,
+            this.Column10,
+            this.Column11});
+            this.dgvMat.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvMat.Location = new System.Drawing.Point(3, 3);
+            this.dgvMat.Name = "dgvMat";
+            this.dgvMat.RowTemplate.Height = 23;
+            this.dgvMat.Size = new System.Drawing.Size(775, 399);
+            this.dgvMat.TabIndex = 1;
+            // 
+            // ITEMNO
+            // 
+            this.ITEMNO.DataPropertyName = "ROWINDEX";
+            this.ITEMNO.HeaderText = "序号";
+            this.ITEMNO.Name = "ITEMNO";
+            this.ITEMNO.Width = 60;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "VWSEQ";
+            this.Column1.HeaderText = "大众顺序号";
+            this.Column1.Name = "Column1";
+            // 
+            // VIN
+            // 
+            this.VIN.DataPropertyName = "VIN";
+            this.VIN.HeaderText = "VIN号";
+            this.VIN.Name = "VIN";
+            this.VIN.ReadOnly = true;
+            this.VIN.Width = 200;
+            // 
+            // CODE
+            // 
+            this.CODE.DataPropertyName = "PRODNO";
+            this.CODE.HeaderText = "零件号";
+            this.CODE.Name = "CODE";
+            this.CODE.ReadOnly = true;
+            this.CODE.Width = 150;
+            // 
+            // NAME
+            // 
+            this.NAME.DataPropertyName = "CARSETDESC_CN";
+            this.NAME.HeaderText = "总成描述";
+            this.NAME.Name = "NAME";
+            this.NAME.ReadOnly = true;
+            // 
+            // CREATETIME
+            // 
+            this.CREATETIME.DataPropertyName = "CP5A";
+            this.CREATETIME.HeaderText = "上线时间";
+            this.CREATETIME.Name = "CREATETIME";
+            this.CREATETIME.ReadOnly = true;
+            this.CREATETIME.Width = 120;
+            // 
+            // Column2
+            // 
+            this.Column2.DataPropertyName = "KIN";
+            this.Column2.HeaderText = "Column2";
+            this.Column2.Name = "Column2";
+            this.Column2.Visible = false;
+            // 
+            // Column3
+            // 
+            this.Column3.DataPropertyName = "LINENO";
+            this.Column3.HeaderText = "Column3";
+            this.Column3.Name = "Column3";
+            this.Column3.Visible = false;
+            // 
+            // Column4
+            // 
+            this.Column4.DataPropertyName = "SANBARCODE";
+            this.Column4.HeaderText = "Column4";
+            this.Column4.Name = "Column4";
+            this.Column4.Visible = false;
+            // 
+            // Column5
+            // 
+            this.Column5.DataPropertyName = "SCANDATE";
+            this.Column5.HeaderText = "Column5";
+            this.Column5.Name = "Column5";
+            this.Column5.Visible = false;
+            // 
+            // Column6
+            // 
+            this.Column6.DataPropertyName = "PASTEDETAILED_CARD_KEY";
+            this.Column6.HeaderText = "Column6";
+            this.Column6.Name = "Column6";
+            this.Column6.Visible = false;
+            // 
+            // Column7
+            // 
+            this.Column7.DataPropertyName = "FIS_KEY";
+            this.Column7.HeaderText = "Column7";
+            this.Column7.Name = "Column7";
+            this.Column7.Visible = false;
+            // 
+            // Column8
+            // 
+            this.Column8.DataPropertyName = "PASTE_CARD_KEY";
+            this.Column8.HeaderText = "Column8";
+            this.Column8.Name = "Column8";
+            this.Column8.Visible = false;
+            // 
+            // Column9
+            // 
+            this.Column9.DataPropertyName = "PASTECARDNO";
+            this.Column9.HeaderText = "Column9";
+            this.Column9.Name = "Column9";
+            this.Column9.Visible = false;
+            // 
+            // Column10
+            // 
+            this.Column10.DataPropertyName = "PRODUCTIONNAME";
+            this.Column10.HeaderText = "Column10";
+            this.Column10.Name = "Column10";
+            this.Column10.Visible = false;
+            // 
+            // Column11
+            // 
+            this.Column11.DataPropertyName = "DGVROWINDEX";
+            this.Column11.HeaderText = "Column11";
+            this.Column11.Name = "Column11";
+            this.Column11.Visible = false;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.btnPrint);
+            this.panel1.Controls.Add(this.btnClose);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(0, 431);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(789, 51);
+            this.panel1.TabIndex = 69;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.ForeColor = System.Drawing.Color.Red;
+            this.label1.Location = new System.Drawing.Point(282, 22);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(0, 16);
+            this.label1.TabIndex = 10;
+            // 
+            // btnPrint
+            // 
+            this.btnPrint.Location = new System.Drawing.Point(528, 22);
+            this.btnPrint.Name = "btnPrint";
+            this.btnPrint.Size = new System.Drawing.Size(75, 21);
+            this.btnPrint.TabIndex = 7;
+            this.btnPrint.Text = "打印";
+            this.btnPrint.UseVisualStyleBackColor = true;
+            this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
+            // 
+            // btnClose
+            // 
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(622, 22);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 21);
+            this.btnClose.TabIndex = 9;
+            this.btnClose.Text = "关闭";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // tsslbl_Message
+            // 
+            this.tsslbl_Message.Name = "tsslbl_Message";
+            this.tsslbl_Message.Size = new System.Drawing.Size(0, 17);
+            // 
+            // statusStrip
+            // 
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsslblMessage,
+            this.tsslbl_Message});
+            this.statusStrip.Location = new System.Drawing.Point(0, 482);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(789, 22);
+            this.statusStrip.TabIndex = 68;
+            this.statusStrip.Text = "statusStrip1";
+            // 
+            // tsslblMessage
+            // 
+            this.tsslblMessage.Name = "tsslblMessage";
+            this.tsslblMessage.Size = new System.Drawing.Size(68, 17);
+            this.tsslblMessage.Text = "消息提示：";
+            // 
+            // FrmCarCardPrintShow
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(789, 504);
+            this.Controls.Add(this.tcEmployee);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.statusStrip);
+            this.Name = "FrmCarCardPrintShow";
+            this.Text = "贴车单打印";
+            this.Load += new System.EventHandler(this.FrmCarCardPrintShow_Load);
+            this.tcEmployee.ResumeLayout(false);
+            this.tpPrint.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMat)).EndInit();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tcEmployee;
+        private System.Windows.Forms.TabPage tpPrint;
+        private System.Windows.Forms.DataGridView dgvMat;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ITEMNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn VIN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button btnPrint;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.ToolStripStatusLabel tsslbl_Message;
+        private System.Windows.Forms.StatusStrip statusStrip;
+        private System.Windows.Forms.ToolStripStatusLabel tsslblMessage;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.resx
new file mode 100644
index 0000000..aae508a
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmCarCardPrintShow.resx
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ITEMNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="VIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ITEMNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="VIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs
new file mode 100644
index 0000000..55ea75a
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs
@@ -0,0 +1,378 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using CarSystem.Account.FileUtil;
+using System.Configuration;
+using DCS.Place;
+using Model;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class TJFrmItemList : Form
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public TJFrmItemList()
+        {
+            InitializeComponent();
+        }
+
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                GetData();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+
+        private void GetData()
+        {
+            string strpasterno = txtPasteNO.Text;
+            string strbegindate = datbegindate.Text;
+            string strenddate = datenddate.Text;
+            string selectPlantCode = cmbtype.SelectedValue.ToString();//生产中心
+            string strOperator = txtOperator.Text;
+            //string vinLack = (cbVinLack.Checked) ? "1" : "0";
+            string vinLack = "0";
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPastecardInfoWithVin.ToString(), strpasterno, strbegindate, strenddate, vinLack, selectPlantCode, strOperator);
+
+            if (tbl.Rows.Count <= 0)
+            {
+                DataTable dt = (DataTable)dgvList.DataSource;
+                if (dt != null)
+                {
+                    dt.Rows.Clear();
+                }
+            }
+            else
+            {
+                dgvList.DataSource = tbl;
+            }
+
+            for (var i = 0; i < dgvList.Rows.Count; i++)
+            {
+                if (dgvList.Rows[i].Cells["PASTECARDDATE2"].Value.ToString() == "1900/1/1 0:00:00")
+                {
+
+                    dgvList.Rows[i].Cells["PASTECARDDATE2"].Value = "";
+                }
+                for (var j = 0; j < dgvList.Rows[i].Cells.Count; j++)
+                {
+                    dgvList.Columns[j].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                }
+            }
+
+
+        }
+
+
+        /// <summary>
+        /// 单击右键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvList_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e)
+        {
+            #region
+            if (e.Button == MouseButtons.Right && e.RowIndex >= 0 && e.ColumnIndex >= 0)
+            {
+                try
+                {
+                    dgvList.Rows[e.RowIndex].ContextMenuStrip = cmenuFunctions;
+
+                    dgvList.Rows[e.RowIndex].Selected = true;
+                    dgvList.CurrentCell = dgvList.Rows[e.RowIndex].Cells[e.ColumnIndex];
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                }
+            }
+            #endregion
+        }
+
+
+        /// <summary>
+        /// 双击
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvList_DoubleClick(object sender, EventArgs e)
+        {
+            if (dgvList.Rows.Count > 0)
+            {
+                int i = dgvList.CurrentRow.Index;
+                string fiskey = dgvList.Rows[i].Cells[0].Value.ToString();
+                TJFrmCarCardDetail frm = new TJFrmCarCardDetail(fiskey);
+                frm.ShowDialog();
+            }
+        }
+
+
+
+        /// <summary>
+        /// 显示行号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvList_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+        {
+            #region
+            try
+            {
+                if (dgvList.Rows.Count > 0)
+                {
+                    e.Graphics.DrawString((e.RowIndex + 1).ToString(), dgvList.DefaultCellStyle.Font,
+                                    new SolidBrush(dgvList.RowHeadersDefaultCellStyle.ForeColor),
+                                    e.RowBounds.Location.X + 15, e.RowBounds.Y + 5);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            #endregion
+        }
+        /// <summary>
+        /// 加载画面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmItemList_Load(object sender, EventArgs e)
+        {
+            #region
+            try
+            {
+                datbegindate.Value = DateTime.Now.AddDays(-1);
+                DataTable dt;
+                //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                //dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardIndex.ToString(),"","");
+                //this.cmbtype.DataSource = dt;
+                //this.cmbtype.DisplayMember = "PLANTNAME";
+                //this.cmbtype.ValueMember = "PLANTNAME";
+
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                DataTable tblCodes = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetWORKCENTERCODE.ToString());
+                IList<EProCodeInfo> proCodes = new List<EProCodeInfo>();
+                for (var i = 0; i < tblCodes.Rows.Count; i++)
+                {
+                    EProCodeInfo epci = new EProCodeInfo();
+                    epci._Name = tblCodes.Rows[i][0].ToString();
+                    epci._Code = tblCodes.Rows[i][0].ToString();
+                    proCodes.Add(epci);
+
+                }
+                cmbtype.DataSource = proCodes;
+                cmbtype.DisplayMember = "_Name";
+                cmbtype.ValueMember = "_Code";
+
+
+
+
+
+
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+            #endregion
+        }
+
+
+
+
+        /// <summary>
+        /// 明细双击
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void cmenuDisplay_Click(object sender, EventArgs e)
+        {
+            TJFrmCarCardPrintShow frm = new TJFrmCarCardPrintShow();
+            frm.ShowDialog();
+        }
+
+        private void comboBox2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnExport_Click(object sender, EventArgs e)
+        {
+
+            if (dgvList.Rows.Count > 0)
+            {
+                if (folderBrowserDialog1.ShowDialog() == DialogResult.OK)
+                {
+                    //SaveFileDialog dlg = new SaveFileDialog();
+                    //dlg.Filter = "CSV (逗号分隔)(*.csv)|*.csv";
+                    //dlg.Title = "导出文件";
+                    //dlg.CheckPathExists = true;
+                    // dlg.OverwritePrompt = true;
+
+                    string sfilename = folderBrowserDialog1.SelectedPath;
+                    //============================================
+                    System.DateTime time = System.DateTime.Now;
+
+                    string xlsName = " ";
+                    string cellName1 = "";
+                    string cellName2 = "";
+                    List<string[]> listResult = new List<string[]>();
+                    xlsName = "贴车单";
+                    cellName1 = "贴车单";
+                    string[] head = { "贴车单单号", "工作中心", "打印时间", "补打时间", "操作者", "底盘号间隔", "生产线名称", "创建日期" };
+                    listResult.Add(head);
+                    // -------------------------2017 02 27 崔法宝 end ---------------------
+                    //sfilename = "贴车单";
+
+                    sfilename = sfilename + @"\" + xlsName + "信息" + ".xls";
+
+                    //判断文件是否存在
+                    if (System.IO.File.Exists(sfilename) == false)
+                    {
+                        System.IO.StreamWriter sr = System.IO.File.CreateText(sfilename);
+                        sr.Close();
+                    }
+                    for (var i = 0; i < dgvList.Rows.Count; i++)
+                    {
+                        string[] lstTmp = {
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["PASTECARDNO"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["PLANTNAME"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String,  dgvList.Rows[i].Cells["PASTECARDDATE"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String,  dgvList.Rows[i].Cells["PASTECARDDATE2"].Value.ToString().Replace("0001/1/1 0:00:00","")),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["OPERATOR"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["VINLACK"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["PRODUCTIONNAME"].Value.ToString()),
+                                          ExcelUtil.GetJoinedData(ExcelUtil.DataType.String, dgvList.Rows[i].Cells["CREATETIME"].Value.ToString())
+                                      };
+                        listResult.Add(lstTmp);
+                    }
+                    ExcelUtil.WriteExcel(sfilename, "贴车单", listResult);
+                    MessageBox.Show("导出成功！");
+                    System.Diagnostics.Process.Start(sfilename);
+
+                }
+            }
+            else
+            {
+                MessageBox.Show("无数据导出！");
+            }
+        }
+
+        // 补打事件
+        private void btnPrint_Click(object sender, EventArgs e)
+        {
+            if (dgvList.Rows.Count > 0)
+            {
+                int i = dgvList.CurrentRow.Index;
+                string fiskey = dgvList.Rows[i].Cells[0].Value.ToString();
+                string PASTECARDNO = dgvList.Rows[i].Cells["PASTECARDNO"].Value.ToString();
+                string PRODUCTIONNAME = dgvList.Rows[i].Cells["PRODUCTIONNAME"].Value.ToString();
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPascardDetailsByPid.ToString(), fiskey);
+                int result = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_UpdatePasteCardPasteCardDate2Value.ToString(), PASTECARDNO, DateTime.Now.ToString(), ClientContext.LoginInfo.UserName.ToString());
+                Print(tbl, PASTECARDNO, PRODUCTIONNAME);
+                if (result > 0)
+                {
+                    MessageBox.Show("补打成功！");
+                    GetData();
+                }
+                else
+                {
+                    MessageBox.Show("补打失败！");
+                }
+
+            }
+            else
+            {
+                MessageBox.Show("无补打数据！");
+
+            }
+
+        }
+
+
+        /// <summary>
+        /// 手动打印功能
+        /// </summary>
+        private void Print(DataTable tbl1, string PASTECARDNO, string PRODUCTIONNAME)
+        {
+
+
+            TJPrintPasteCard prin = new TJPrintPasteCard();
+
+            string strprodtype = "(" + PRODUCTIONNAME + ")";
+
+            DataTable dt = new DataTable();
+            dt.Columns.Add("ROWINDEX");
+            dt.Columns.Add("VWSEQ");
+            dt.Columns.Add("VIN");
+            dt.Columns.Add("PRODNO");
+            dt.Columns.Add("CARSETDESCCN");
+            dt.Columns.Add("CP5A");
+            dt.Columns.Add("PASTECARDNO");
+            dt.Columns.Add("SCANDATE");
+            dt.Columns.Add("PRODUCTIONNAME");
+            dt.Columns.Add("LINENO");
+            int index = 1;
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPastecardDeatis.ToString());
+
+           // index = Convert.ToInt32(tbl.Rows[0][0].ToString());
+            for (var i = 0; i < tbl1.Rows.Count; i++)
+            {
+                DataRow ncsdr = dt.NewRow();
+                ncsdr["ROWINDEX"] = index.ToString(); ;
+                ncsdr["VWSEQ"] = tbl1.Rows[i]["VWSEQ"].ToString();
+                ncsdr["VIN"] = tbl1.Rows[i]["VIN"].ToString();
+                ncsdr["PRODNO"] = tbl1.Rows[i]["PRODNO"].ToString();
+                ncsdr["CARSETDESCCN"] = tbl1.Rows[i]["CARSETDESC_CN"].ToString();
+                ncsdr["CP5A"] = tbl1.Rows[i]["CP5A"].ToString();
+                ncsdr["PASTECARDNO"] = PASTECARDNO;
+                ncsdr["SCANDATE"] = DateTime.Now.ToString();
+                ncsdr["PRODUCTIONNAME"] = strprodtype;
+                ncsdr["LINENO"] = tbl1.Rows[i]["LINENO"].ToString();
+                dt.Rows.Add(ncsdr);
+                index++;
+            }
+            prin.Print(dt);
+            //MessageBox.Show("打印成功！");
+
+
+        }
+
+
+
+
+
+
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs
new file mode 100644
index 0000000..3d66951
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.designer.cs
@@ -0,0 +1,386 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJFrmItemList
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.dgvList = new System.Windows.Forms.DataGridView();
+            this.txtPasteNO = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.btnSearch = new System.Windows.Forms.Button();
+            this.datenddate = new System.Windows.Forms.DateTimePicker();
+            this.label2 = new System.Windows.Forms.Label();
+            this.datbegindate = new System.Windows.Forms.DateTimePicker();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.btnPrint = new System.Windows.Forms.Button();
+            this.cmbtype = new System.Windows.Forms.ComboBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtOperator = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btnExport = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.cmenuDisplay = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmenuFunctions = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.PASTECARDNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PLANTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PASTECARDDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PASTECARDDATE2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OPERATOR = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.VINLACK = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PRODUCTIONNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
+            this.groupBox3.SuspendLayout();
+            this.cmenuFunctions.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dgvList
+            // 
+            this.dgvList.AllowUserToAddRows = false;
+            this.dgvList.AllowUserToDeleteRows = false;
+            this.dgvList.AllowUserToResizeRows = false;
+            this.dgvList.BackgroundColor = System.Drawing.Color.White;
+            this.dgvList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.PASTECARDNO,
+            this.PLANTNAME,
+            this.PASTECARDDATE,
+            this.PASTECARDDATE2,
+            this.OPERATOR,
+            this.VINLACK,
+            this.PRODUCTIONNAME,
+            this.CREATETIME,
+            this.PID});
+            this.dgvList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvList.Location = new System.Drawing.Point(0, 97);
+            this.dgvList.Name = "dgvList";
+            this.dgvList.ReadOnly = true;
+            this.dgvList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToFirstHeader;
+            this.dgvList.RowTemplate.Height = 23;
+            this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvList.Size = new System.Drawing.Size(1005, 578);
+            this.dgvList.TabIndex = 13;
+            this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown);
+            this.dgvList.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvList_RowPostPaint);
+            this.dgvList.DoubleClick += new System.EventHandler(this.dgvList_DoubleClick);
+            // 
+            // txtPasteNO
+            // 
+            this.txtPasteNO.Location = new System.Drawing.Point(67, 18);
+            this.txtPasteNO.Name = "txtPasteNO";
+            this.txtPasteNO.Size = new System.Drawing.Size(111, 21);
+            this.txtPasteNO.TabIndex = 11;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(6, 22);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(53, 12);
+            this.label4.TabIndex = 10;
+            this.label4.Text = "贴车单号";
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Location = new System.Drawing.Point(22, 62);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(75, 23);
+            this.btnSearch.TabIndex = 9;
+            this.btnSearch.Text = "查询";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // datenddate
+            // 
+            this.datenddate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.datenddate.Location = new System.Drawing.Point(747, 20);
+            this.datenddate.Name = "datenddate";
+            this.datenddate.Size = new System.Drawing.Size(110, 21);
+            this.datenddate.TabIndex = 5;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(730, 25);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(11, 12);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "~";
+            // 
+            // datbegindate
+            // 
+            this.datbegindate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.datbegindate.Location = new System.Drawing.Point(604, 19);
+            this.datbegindate.Name = "datbegindate";
+            this.datbegindate.Size = new System.Drawing.Size(111, 21);
+            this.datbegindate.TabIndex = 4;
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.btnPrint);
+            this.groupBox3.Controls.Add(this.cmbtype);
+            this.groupBox3.Controls.Add(this.label5);
+            this.groupBox3.Controls.Add(this.txtOperator);
+            this.groupBox3.Controls.Add(this.label3);
+            this.groupBox3.Controls.Add(this.btnExport);
+            this.groupBox3.Controls.Add(this.txtPasteNO);
+            this.groupBox3.Controls.Add(this.label4);
+            this.groupBox3.Controls.Add(this.btnSearch);
+            this.groupBox3.Controls.Add(this.datenddate);
+            this.groupBox3.Controls.Add(this.datbegindate);
+            this.groupBox3.Controls.Add(this.label2);
+            this.groupBox3.Controls.Add(this.label1);
+            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupBox3.Location = new System.Drawing.Point(0, 0);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(1005, 97);
+            this.groupBox3.TabIndex = 14;
+            this.groupBox3.TabStop = false;
+            // 
+            // btnPrint
+            // 
+            this.btnPrint.Location = new System.Drawing.Point(190, 62);
+            this.btnPrint.Name = "btnPrint";
+            this.btnPrint.Size = new System.Drawing.Size(75, 23);
+            this.btnPrint.TabIndex = 23;
+            this.btnPrint.Text = "补打印";
+            this.btnPrint.UseVisualStyleBackColor = true;
+            this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
+            // 
+            // cmbtype
+            // 
+            this.cmbtype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbtype.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbtype.FormattingEnabled = true;
+            this.cmbtype.Location = new System.Drawing.Point(446, 17);
+            this.cmbtype.Name = "cmbtype";
+            this.cmbtype.Size = new System.Drawing.Size(83, 24);
+            this.cmbtype.TabIndex = 22;
+            this.cmbtype.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged);
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(387, 21);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(53, 12);
+            this.label5.TabIndex = 19;
+            this.label5.Text = "发运中心";
+            // 
+            // txtOperator
+            // 
+            this.txtOperator.Location = new System.Drawing.Point(248, 18);
+            this.txtOperator.Name = "txtOperator";
+            this.txtOperator.Size = new System.Drawing.Size(111, 21);
+            this.txtOperator.TabIndex = 18;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(201, 21);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(41, 12);
+            this.label3.TabIndex = 17;
+            this.label3.Text = "操作者";
+            // 
+            // btnExport
+            // 
+            this.btnExport.Location = new System.Drawing.Point(103, 62);
+            this.btnExport.Name = "btnExport";
+            this.btnExport.Size = new System.Drawing.Size(75, 23);
+            this.btnExport.TabIndex = 16;
+            this.btnExport.Text = "导出";
+            this.btnExport.UseVisualStyleBackColor = true;
+            this.btnExport.Click += new System.EventHandler(this.btnExport_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(545, 25);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "打印时间";
+            // 
+            // cmenuDisplay
+            // 
+            this.cmenuDisplay.Name = "cmenuDisplay";
+            this.cmenuDisplay.Size = new System.Drawing.Size(100, 22);
+            this.cmenuDisplay.Text = "明细";
+            this.cmenuDisplay.Click += new System.EventHandler(this.cmenuDisplay_Click);
+            // 
+            // cmenuFunctions
+            // 
+            this.cmenuFunctions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmenuDisplay});
+            this.cmenuFunctions.Name = "cmenuFunctions";
+            this.cmenuFunctions.Size = new System.Drawing.Size(101, 26);
+            this.cmenuFunctions.Text = "操作列表的功能";
+            // 
+            // PASTECARDNO
+            // 
+            this.PASTECARDNO.DataPropertyName = "PASTECARDNO";
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.PASTECARDNO.DefaultCellStyle = dataGridViewCellStyle2;
+            this.PASTECARDNO.HeaderText = "贴车单单号";
+            this.PASTECARDNO.Name = "PASTECARDNO";
+            this.PASTECARDNO.ReadOnly = true;
+            this.PASTECARDNO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PASTECARDNO.Width = 150;
+            // 
+            // PLANTNAME
+            // 
+            this.PLANTNAME.DataPropertyName = "PLANTNAME";
+            this.PLANTNAME.HeaderText = "发运中心";
+            this.PLANTNAME.Name = "PLANTNAME";
+            this.PLANTNAME.ReadOnly = true;
+            // 
+            // PASTECARDDATE
+            // 
+            this.PASTECARDDATE.DataPropertyName = "PASTECARDDATE";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.PASTECARDDATE.DefaultCellStyle = dataGridViewCellStyle3;
+            this.PASTECARDDATE.HeaderText = "打印时间";
+            this.PASTECARDDATE.Name = "PASTECARDDATE";
+            this.PASTECARDDATE.ReadOnly = true;
+            this.PASTECARDDATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PASTECARDDATE.Width = 150;
+            // 
+            // PASTECARDDATE2
+            // 
+            this.PASTECARDDATE2.DataPropertyName = "PASTECARDDATE2";
+            this.PASTECARDDATE2.HeaderText = "补打时间";
+            this.PASTECARDDATE2.Name = "PASTECARDDATE2";
+            this.PASTECARDDATE2.ReadOnly = true;
+            this.PASTECARDDATE2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PASTECARDDATE2.Width = 150;
+            // 
+            // OPERATOR
+            // 
+            this.OPERATOR.DataPropertyName = "OPERATOR";
+            this.OPERATOR.HeaderText = "操作者";
+            this.OPERATOR.Name = "OPERATOR";
+            this.OPERATOR.ReadOnly = true;
+            this.OPERATOR.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // VINLACK
+            // 
+            this.VINLACK.DataPropertyName = "VINLACK";
+            this.VINLACK.HeaderText = "底盘号间隔";
+            this.VINLACK.Name = "VINLACK";
+            this.VINLACK.ReadOnly = true;
+            // 
+            // PRODUCTIONNAME
+            // 
+            this.PRODUCTIONNAME.DataPropertyName = "PRODUCTIONNAME";
+            this.PRODUCTIONNAME.HeaderText = "生产线名称";
+            this.PRODUCTIONNAME.Name = "PRODUCTIONNAME";
+            this.PRODUCTIONNAME.ReadOnly = true;
+            this.PRODUCTIONNAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PRODUCTIONNAME.Width = 80;
+            // 
+            // CREATETIME
+            // 
+            this.CREATETIME.DataPropertyName = "CREATETIME";
+            this.CREATETIME.HeaderText = "创建日期";
+            this.CREATETIME.Name = "CREATETIME";
+            this.CREATETIME.ReadOnly = true;
+            this.CREATETIME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CREATETIME.Width = 150;
+            // 
+            // PID
+            // 
+            this.PID.DataPropertyName = "PID";
+            this.PID.HeaderText = "Column4";
+            this.PID.Name = "PID";
+            this.PID.ReadOnly = true;
+            this.PID.Visible = false;
+            // 
+            // TJFrmItemList
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1005, 675);
+            this.Controls.Add(this.dgvList);
+            this.Controls.Add(this.groupBox3);
+            this.Name = "TJFrmItemList";
+            this.Text = "贴车单记录";
+            this.Load += new System.EventHandler(this.FrmItemList_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvList)).EndInit();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.cmenuFunctions.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridView dgvList;
+        private System.Windows.Forms.TextBox txtPasteNO;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button btnSearch;
+        private System.Windows.Forms.DateTimePicker datenddate;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DateTimePicker datbegindate;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ToolStripMenuItem cmenuDisplay;
+        private System.Windows.Forms.ContextMenuStrip cmenuFunctions;
+        private System.Windows.Forms.Button btnExport;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txtOperator;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.ComboBox cmbtype;
+        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+        private System.Windows.Forms.Button btnPrint;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PASTECARDNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PLANTNAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PASTECARDDATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PASTECARDDATE2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OPERATOR;
+        private System.Windows.Forms.DataGridViewTextBoxColumn VINLACK;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PRODUCTIONNAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PID;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.resx
new file mode 100644
index 0000000..ca7436e
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="PASTECARDNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PLANTNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PASTECARDDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PASTECARDDATE2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="OPERATOR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="VINLACK.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PRODUCTIONNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cmenuFunctions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>166, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>191</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
new file mode 100644
index 0000000..809c6f6
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@@ -0,0 +1,2489 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using QM.Account;
+using DCS.Common;
+using Model;
+using QM.Assist;
+using DCS.Place;
+using QMAPP.FJC.Entity.Operation;
+using QMAPP.Entity;
+using QMAPP.MD.Entity;
+using QMAPP.FJC.Entity.Basic;
+using QMAPP.FJC.Entity.TianJin;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+
+    /// <summary>
+    /// 工位终端FIS发货效验功能
+    /// 创建时间:2012-11-12
+    /// 创 建 人:pxbibm
+    /// H1:modified by sun g.q. on 20130330
+    /// 1）隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置；
+    /// 2）增加 CreatePastecardNo(String lineNo)代替CreatePastecardNo()，贴车单流水号，根据生产线代码生成；
+    /// 3）校准功能进行了bug修改；
+    /// 4）20190325移植了成都DCS发运功能，同时保留原有发运，校验信息通过零件规则表判断//gzf。
+    /// 5）20190325成都存在东西厂情况，且未来要货可能都混线生产，现场操作者要讲求快速切换发货，将单选按钮恢复，且用此过滤发货计划。--gzf
+    /// </summary>
+    public partial class TJFrmPlace : Form
+    {
+
+        #region 常量
+        private const string DISPLAY_NAME = "工位终端";
+        private DataTable dt = null;
+        private DataTable dtmat = null;
+        private DataTable dtpro = null;
+        private BindingSource bs;
+        private bool setRedBackgroudFlag = false;//设置第一次设置背景颜色校验标识
+        //获取服务代理
+        QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent();
+        List<BarcodeRules> _barcodeRules = null;
+        public delegate void myMethodDelegate();
+        #endregion
+
+        #region 变量
+        public string a = "1";
+        DateTime _dt = DateTime.Now;
+        //2016-01-07 增加车架的1号位置的扫描校验
+        private string placeFirstPosition = ""; //1号码标识
+        private DateTime placeFirstPositionTime = DateTime.MinValue;//获取1号码的时间
+        int BarcodeTime = 10000;
+        /// <summary>
+        /// 指令二次确认
+        /// </summary>
+        string _CMDConfirm = "";
+
+        public string WORKCENTER_CODE = "";//工作重心参数
+        public string ProMaterial = "";//扫描产品物料信息
+        #endregion
+
+        #region 界面初始化
+        public TJFrmPlace()
+        {
+            InitializeComponent();
+            _barcodeRules = _agent.InvokeServiceFunction<List<BarcodeRules>>("BarcodeRulesBLL_GetListForSend");
+        }
+        #endregion 
+
+        #region 绑定DataGridView
+        /// <summary>
+        /// 绑定DataGridView
+        /// </summary>
+        private DataTable BindDataGridView()
+        {
+            #region
+            return null;
+            #endregion
+        }
+        #endregion
+
+        #region 字段
+        //主键
+        private string strFiskey;
+        //大众顺序号
+        private string strvwseq;
+        //位置
+        private string strmouldcode;
+        //车身号
+        private string strkin;
+        //底盘号
+        private string strvin;
+        //零件号
+        private string strprodno;
+        //总成描述
+        private string strcarsetdesc_cn;
+        //上线时间
+        private string strcp5a;
+        //车型
+        private string strlineno;
+        //扫描状态
+        private string strscanstat;
+
+        int nfindex = 0;
+        //int ncsindex = 0;
+        //int rowindex = 0;
+        /// <summary>
+        /// NF贴车单明细列表
+        /// </summary>
+        List<TJEPasteDetailsCard> nflist = null;
+        /// <summary>
+        /// NCS贴车单明细列表
+        /// </summary>
+        List<TJEPasteDetailsCard> ncslist = null;
+        /// <summary>
+        /// NF贴车单主键
+        /// </summary>
+        string nfpastcardkey = "";
+
+        /// <summary>
+        /// 当前guidview行号
+        /// </summary>
+        int dgvrowindex = 0;
+        /// <summary>
+        /// 正确的声音文件路径
+        /// </summary>
+        private string okSoundPath = null;
+
+        public string pFisType = "";
+        /// <summary>
+        /// 错误的声音文件路径
+        /// </summary>
+        private string errorSoundPath = null;
+        #endregion 
+
+        #region FIS数据列Post
+        /// <summary>
+        /// FIS数据列Post
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvMATChange_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+        {
+            #region
+            try
+            {
+                if (dgvMATChange.Rows.Count > 0)
+                {
+                    e.Graphics.DrawString((e.RowIndex + 1).ToString(), dgvMATChange.RowHeadersDefaultCellStyle.Font,
+                                    new SolidBrush(dgvMATChange.RowHeadersDefaultCellStyle.ForeColor),
+                                    e.RowBounds.Location.X + 15, e.RowBounds.Y + 5);
+                }
+            }
+            catch (Exception ex)
+            {
+                //MessageBox.Show(ex.Message);
+                lberror.Text = ex.Message;
+            }
+            #endregion
+        }
+        #endregion
+
+        #region 获取混线,单线FIS数据
+        /// <summary>
+        /// 获取混线,单线FIS数据
+        /// </summary>
+        /// <param name="pFisType"></param>
+        public void GetInitData()
+        {
+            #region
+            try
+            {
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetList.ToString(), pFisType, WORKCENTER_CODE);
+                
+                tbl.AcceptChanges();
+                if (tbl.Rows.Count <= 0)
+                {
+                    DataTable dt = (DataTable)dgvMATChange.DataSource;
+                    if (dt != null)
+                    {
+                        dt.Rows.Clear();
+                    }
+                }
+                else
+                {
+                    dgvMATChange.DataSource = tbl;
+                }
+                setRedBackgroudFlag = false;
+                SetRowColor();
+                computenfncs();
+            }
+            catch (Exception ex)
+            {
+                //MessageBox.Show(ex.Message);
+                lberror.Text = ex.Message;
+            }
+            finally
+            {
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region 获取EPasteDetailsCard数据
+        /// <summary>
+        /// 
+        /// </summary>
+        public void GetInitData2()
+        {
+            try
+            {
+                dgvNF.DataSource = new List<EPasteDetailsCard>();
+                nfpastecard = null;
+                nflist = null;
+                nfindex = 0;
+                dgvrowindex = 0;
+                setRedBackgroudFlag = false;
+            }
+            catch (Exception ex)
+            {
+                //MessageBox.Show(ex.Message);
+                lberror.Text = ex.Message;
+            }
+            finally
+            {
+            }
+        }
+        #endregion 
+
+        #region 设置FIS数据颜色
+        /// <summary>
+        /// 设置FIS数据颜色
+        /// </summary>
+        private void SetRowColor()
+        {
+            if (setRedBackgroudFlag == true)
+            {
+                //return;
+            }
+            //底盘号
+            int vinNumber = 0;
+            int lastVinNumber = 0;
+            int num = 0;
+            int defaultNum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", "4"]);
+            for (int i = 0; i < this.dgvMATChange.Rows.Count; i++)
+            {
+                vinNumber = Convert.ToInt32(dgvMATChange.Rows[i].Cells["REQUESTID"].Value.ToString());
+                //vinNumber = Convert.ToInt32(dgvMATChange.Rows[i].Cells["PID"].Value.ToString());
+                //2016-01-21 wangqingnan 如果行变色则不重新刷颜色
+                var fispid = dgvMATChange.Rows[i].Cells[PID.Name].Value.ToString();
+                if (nflist != null && nflist.Exists(p => p.FIS_KEY == fispid))
+                {
+                    this.dgvMATChange.Rows[i].Cells[clscanstate.Name].Value = "1";
+                }
+
+                //if (this.dgvMATChange.Rows[i].Cells[clscanstate.Name].Value.ToString() == "1")
+                //{
+                //    this.dgvMATChange.Rows[i].DefaultCellStyle.BackColor = Color.White;
+                //    continue;
+                //}
+                //2016-01-21 wangqingnan 如果行变色则不重新刷颜色
+                //int defaultNum = Convert.ToInt32(QM.Config.CustomConfig.GetItem("ShowDataCount"));
+
+                if (num == 0)
+                {
+                    this.dgvMATChange.Rows[i].DefaultCellStyle.BackColor = Color.Yellow;
+                    if ((i + 1) % defaultNum == 0)
+                    {
+                        num = 1;
+                    }
+                }
+                else
+                {
+                    this.dgvMATChange.Rows[i].DefaultCellStyle.BackColor = Color.YellowGreen;
+                    if ((i + 1) % defaultNum == 0)
+                    {
+                        num = 0;
+                    }
+                }
+                //2016-10-31 闫永刚 如果出现该底盘号与上一条底盘号间断的情况，
+                //设置当前底盘号的颜色为红色
+                if (lastVinNumber > 0)
+                {
+                    if ((vinNumber - lastVinNumber) > 1)
+                    {
+                        this.dgvMATChange.Rows[i - 1].DefaultCellStyle.BackColor = Color.Red;
+                        this.dgvMATChange.Rows[i].DefaultCellStyle.BackColor = Color.Red;
+                        setRedBackgroudFlag = true;
+                    }
+                }
+                lastVinNumber = vinNumber;
+            }
+            if (dgvMATChange.RowCount > 0)
+            {
+                dgvMATChange.FirstDisplayedScrollingRowIndex = nfindex - nfindex % 4;
+            }
+            dgvMATChange.Refresh();
+            dgvMATChange.ClearSelection();
+            txtCode.Focus();
+        }
+        #endregion 
+
+   
+
+        #region 处理扫描条码框设置焦点
+        /// <summary>
+        /// 处理扫描条码框设置焦点
+        /// </summary>
+        private void ArragetxtCode()
+        {
+            txtCode.Text = string.Empty;
+            //Activates the control.
+            txtCode.Select();
+            //Sets input focus to the control.
+            txtCode.Focus();
+        }
+        #endregion 
+
+        #region 加载画面
+        /// <summary>
+        /// 加载画面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmElevateRequest_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                timeRefew.Enabled = true;
+                //UserBuffer.Interval = CtlApp.GetInterval(QM.Config.CustomConfig.GetItem("RefreshTime"));
+                UserBuffer.Interval = CtlApp.GetInterval(QMAPP.WinForm.Common.LocalSetting.Settings["RefreshTime","20"]);
+                timeRefew.Interval = UserBuffer.Interval;
+                //BarcodeTime = int.Parse(QM.Config.CustomConfig.GetItem("BarcodeTime"));
+                //BarcodeTime = int.Parse(QMAPP.WinForm.Common.LocalSetting.Settings["BarcodeTime","1"]);
+                okSoundPath = System.Configuration.ConfigurationManager.AppSettings["SaveFilePath"] + "Sound\\" + PlaySoundConst.strSoundOk;
+                errorSoundPath = System.Configuration.ConfigurationManager.AppSettings["SaveFilePath"] + "Sound\\" + PlaySoundConst.strSoundNg;
+
+                //隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置；
+                //pFisType = "01";
+                //pFisType = QM.Config.CustomConfig.GetItem("FlashProCode");
+                //pFisType = QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode","01"];
+
+
+                pFisType = QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode", ""];
+                if (!string.IsNullOrEmpty(pFisType))
+                {
+                    if (pFisType.Equals("01"))
+                    {
+                        rb_dx.Checked = true;
+                    }
+                    else
+                    {
+                        rb_dx.Checked = true;
+                    }
+                }
+
+                //发运信息直接用单选按钮过滤，工作中心字段用作打印功能格式使用
+                //WORKCENTER_CODE = QMAPP.WinForm.Common.LocalSetting.Settings["PlantNameConfig", ""];
+                WORKCENTER_CODE = "IPFY" + pFisType;
+
+                //发运框设置
+                InitContainer();
+                GetInitData();
+                //SetShowData();
+                //computenfncs();//lable1原有copy代码  这个功能注释掉了 崔法宝-20170905调整 
+                dgvMATChange.ClearSelection();
+                dgvNF.AutoGenerateColumns = false;
+
+                SetPastNOConfirm(0);
+                GetLastPastCard();
+                //lblLastPastNO.Text = "";
+
+            }
+            catch (Exception ex)
+            {
+
+                //MessageBox.Show(ex.Message);
+                lberror.Text = ex.Message;
+            }
+            finally
+            {
+                ArragetxtCode();
+                dgvMATChange.ClearSelection();
+            }
+
+
+        }
+        #endregion 
+
+        #region 获取上一条发运单信息
+        /// <summary>
+        /// 获取上一条发运单信息
+        /// </summary>
+        private void GetLastPastCard()
+        {
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            var lastpastcard= agent.InvokeServiceFunction<FJC.Entity.SendManage.PastCard>("TJFrmPlaceBLL_GetLastPastCard", pFisType);
+            if (lastpastcard != null)
+            {
+                lblLastPastNO.Text = lastpastcard.PASTECARDNO;
+            }
+        }
+        #endregion 
+
+        #region 设置贴车单确认状态
+        /// <summary>
+        /// 设置贴车单确认状态
+        /// </summary>
+        /// <param name="state">0:未确认 1：确认OK 2：确认失败</param>
+        private void SetPastNOConfirm(int state)
+        {
+            switch (state)
+            {
+                case 0:
+                    {
+                        pbPastNoConfirmed.Enabled = false;
+                        pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.help;
+                        break;
+                    }
+                case 1:
+                    {
+                        pbPastNoConfirmed.Enabled = true;
+                        pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.ok;
+                        break;
+                    }
+                case 2:
+                    {
+                        pbPastNoConfirmed.Enabled = false;
+                        pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.cancel;
+                        break;
+                    }
+                default:
+                    {
+                        pbPastNoConfirmed.Enabled = false;
+                        pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.stop;
+                        break;
+                    }
+            }
+        }
+        #endregion 
+
+        #region 贴车单查询功能
+        /// <summary>
+        /// 贴车单查询功能
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            TJFrmItemList frm = new TJFrmItemList();
+            frm.ShowDialog();
+            txtCode.Focus();
+        }
+        #endregion 
+
+        #region 实现效验功能
+        /// <summary>
+        /// 实现效验功能
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnJZ_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (MessageBox.Show("您确定要挂起当前计划吗吗？", "挂起提示", MessageBoxButtons.YesNo) == DialogResult.Yes)
+                {
+                    if (nfindex > 0)
+                    {
+                        MessageBox.Show("发运已开始扫描无法进行计划挂起！", "挂起提示");
+                        return;
+                    }
+                    List<string> ids = new List<string>();
+                    foreach (System.Windows.Forms.DataGridViewRow row in dgvMATChange.SelectedRows)
+                    {
+                        //var SS = row..DataBoundItem;
+
+                        var pid = row.Cells["PID"].Value.ToString();
+                        var state = row.Cells["STATE"].Value.ToString();
+
+                        if (int.Equals(state, 1))
+                        {
+                            MessageBox.Show("只可挂起未扫描的计划！");
+                            return;
+                        }
+                        ids.Add(pid);
+                    }
+                    QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                    agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_UpdateWorkOrderState.ToString(), ids);
+                    
+                //_agent.InvokeServiceFunction<int>(B9IPCService.WorkOrderBLL_CancelSuspend.ToString(), ids);
+
+                    //if (dgvMATChange.Rows.Count > 0)
+                    //{
+                    //    int i = dgvMATChange.CurrentRow.Index;
+                    //    string strvwseq = dgvMATChange.Rows[i].Cells["REQUESTID"].Value.ToString();
+                    //    //上线时间
+                    //    string strCP5A = dgvMATChange.Rows[i].Cells["CP5A"].Value.ToString();
+
+                    //    //BllFisOrder bllFisOrder = new BllFisOrder();
+                    //    //bllFisOrder.UpdateFisOrder(strvwseq, strCP5A);
+
+                    //    QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                    //    agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_UpdateFisOrder.ToString(), strvwseq, strCP5A, WORKCENTER_CODE);
+                    //    GetInitData();
+                    //}
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+            finally
+            {
+                txtCode.Focus();
+            }
+        }
+        #endregion 
+
+        #region 获取FIS数据
+        /// <summary>
+        /// 获取FIS数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnGetFisData_Click(object sender, EventArgs e)
+        {
+            if (dgvNF.Rows.Count == 0)
+            {
+                GetInitData();
+                //computenfncs();
+            }
+        }
+        #endregion 
+
+        #region 手动刷新
+        /// <summary>
+        /// 手动刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnRef_Click(object sender, EventArgs e)
+        {
+            GetInitData();
+        }
+        #endregion
+
+        #region 创建贴车单号
+        //EPasteCard nfpastecard = null;
+        /// <summary>
+        /// 创建贴车单号
+        /// 贴车单号的规则生成贴车单号，格式为“FB”（2位）+日期（8位，20121008）+流水号（4位）；
+        /// </summary>
+        /// <returns></returns>
+        private string CreatePastecardNo()
+        {
+            #region
+            //BllFisOrder bllFisOrder = new BllFisOrder();
+            string strdate = DateTime.Now.ToString("yyyyMMdd");
+            // DataTable tbl = bllFisOrder.GetPastecardNo(DateTime.Now.ToShortDateString());
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardNo.ToString(), DateTime.Now.ToShortDateString());
+            string strindex = tbl.Rows[0][0].ToString().PadLeft(4, '0');
+            string pastecardno = string.Format("FB{0}{1}", strdate, strindex);
+            return pastecardno;
+            #endregion
+        }
+        #endregion
+
+        #region 创建贴车单号（外来）
+        /// <summary>
+        /// 创建贴车单号
+        /// 贴车单号的规则生成贴车单号，格式为“生产线代码”（2位）+日期（8位，20121008）+流水号（4位）；
+        /// 20190329--贴车单号的规则生成贴车单号，格式为“生产线代码”（工作中心）+日期（8位，20121008）+流水号（4位）
+        /// </summary>
+        /// <returns></returns>
+        private string CreatePastecardNo(String lineNo)
+        {
+            #region
+            String prefix = lineNo;
+            //BllFisOrder bllFisOrder = new BllFisOrder();
+            //2016-10-30闫永刚获取贴车单号修改
+            // DataTable dt = bllFisOrder.GetPastecardIndex();
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            //DataTable dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardIndex.ToString());
+            DataTable dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetDaspssteCarIndexByPlanName.ToString(), prefix);
+            string PASTECARDNO = "";
+            string OLD_PASTECARDNO = "";
+            string NEW_PASTECARDNO = "";
+            if (dt.Rows.Count == 0)
+            {
+                PASTECARDNO =lineNo+ DateTime.Now.ToString("yyyyMMdd") + "0001";
+                nfpastecard.PASTECARDNO = PASTECARDNO;
+                int delResult = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_InsertDaspssteCarIndexByPlanName.ToString(), nfpastecard);
+            }
+            else
+            {
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //OLD_PASTECARDNO = dr["PASTECARDNO"].ToString();
+                    //int Addvalue = Convert.ToInt32(OLD_PASTECARDNO.Substring(OLD_PASTECARDNO.Length - 1, 1)) + 1;
+                    //NEW_PASTECARDNO = OLD_PASTECARDNO.Substring(lineNo.Length, OLD_PASTECARDNO.Length - lineNo.Length - 1) + Addvalue.ToString();
+                    //20190314
+                    PASTECARDNO = dr["PASTECARDNO"].ToString();
+                    if ((Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length < 4)
+                    {
+                        int num = 4 - (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length;
+                        string value = (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                        string sumValue = "";
+                        for (var i = 0; i < num; i++)
+                        {
+                            sumValue = sumValue + "0";
+                        }
+                        if (PASTECARDNO.Substring(lineNo.Length, PASTECARDNO.Length - lineNo.Length - 4).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                        {
+                            PASTECARDNO = PASTECARDNO.Substring(lineNo.Length, PASTECARDNO.Length - lineNo.Length - 4) + sumValue + value;
+                        }
+                        else
+                        {
+                            PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                        }
+                    }
+                    else
+                    {
+                        if (PASTECARDNO.Substring(lineNo.Length, 8).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                        {
+                            PASTECARDNO = PASTECARDNO.Substring(lineNo.Length, PASTECARDNO.Length - lineNo.Length - 2) + (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                        }
+                        else
+                        {
+                            PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                        }
+                    }
+                    //nfpastecard.PASTECARDNO = PASTECARDNO;
+                    //nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
+                }
+                PASTECARDNO = lineNo + PASTECARDNO;
+            }
+
+            return PASTECARDNO;
+            #region XXX
+            //string pasteCardIndex = "";
+            //DateTime updateTime;
+            //foreach (DataRow dr in dt.Rows)
+            //{
+            //    string lineNoRow = dr["PASTECARDNO"].ToString().Substring(0, 2);
+
+            //    if (lineNo == lineNoRow)
+            //    {
+            //        pasteCardIndex = dr["PASTECARDNO"].ToString();
+            //        updateTime = Convert.ToDateTime(dr["PASTECARDDATE"]);
+            //    }
+            //}
+
+
+            //string strdate = DateTime.Now.ToString("yyyyMMdd");
+            //string strindex = "";
+            //if (pasteCardIndex.Substring(2, 8) == strdate)
+            //{
+            //    strindex = (Convert.ToInt32(pasteCardIndex.Substring(10, 4)) + 1).ToString().PadLeft(4, '0');
+            //}
+            //else
+            //{
+            //    strindex = "0001";
+            //}
+
+            //原来获取贴车单方式
+            //string strdate = DateTime.Now.ToString("yyyyMMdd");
+            //DataTable tbl = bllFisOrder.GetPastecardNo(DateTime.Now.ToShortDateString(), prefix);
+            //string strindex = tbl.Rows[0][0].ToString().PadLeft(4, '0');
+            //string pastecardno = string.Format("{0}{1}{2}", prefix, strdate, strindex);
+            //return pastecardno;
+            #endregion
+            #endregion
+        }
+        #endregion
+
+        #region 删除已经打印过的贴车单FIS列表
+        /// <summary>
+        /// 删除已经打印过的贴车单FIS列表
+        /// </summary>
+        /// <param name="pnflist"></param>
+        /// <param name="pnflist2"></param>
+        private void DGVRemoveRow(List<TJEPasteDetailsCard> pnflist, ref List<TJEPasteDetailsCard> pnflist2)
+        {
+            #region
+            if (pnflist2 != null)
+            {
+                for (int rowindex = 0; rowindex < pnflist2.Count; rowindex++)
+                {
+                    string tempfiskey2 = pnflist2[rowindex].FIS_KEY;
+                    for (int rowindex1 = 0; rowindex1 < dgvMATChange.Rows.Count; rowindex1++)
+                    {
+                        string tempFiskey1 = dgvMATChange.Rows[rowindex1].Cells["clFiskey"].Value.ToString();
+                        if (tempFiskey1 == tempfiskey2)
+                        {
+                            DataGridViewCellStyle ds = new DataGridViewCellStyle();
+                            ds.BackColor = Color.Green;
+                            this.dgvMATChange.Rows[rowindex1].DefaultCellStyle = ds;
+                            //当删除了满6个的记录后，另一个数据集的行号需要重新排列。
+                            dgvMATChange.Rows[rowindex1].Cells[clscanstate.Name].Value = "1";
+                            pnflist2[rowindex].DGVROWINDEX = rowindex1;
+                            break;
+                        }
+                    }
+                }
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region NF贴车单手动打印功能
+        /// <summary>
+        /// NF贴车单手动打印功能
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnPrint_NF_Click(object sender, EventArgs e)
+        {
+            #region
+            bool isprint = false;
+            try
+            {
+                if (nflist != null)
+                {
+                    if (MessageBox.Show("您确定要提交并且打印数据吗？", "信息提示", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+                    {
+                        //当点击了确定，则会执行删除操作
+                        QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                        DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetDaspssteCarIndexByPlanName.ToString());
+                        if (tbl.Rows.Count > 0)
+                        {
+                            nfpastecard.PASTECARDNO = tbl.Rows[0][0].ToString();
+                        }
+                        else
+                        {
+                            MessageBox.Show("无法打印！");
+                        }
+                        EFailLog log = new EFailLog();
+                        log.TID = Guid.NewGuid().ToString();
+                        log.FCT_DATE = DateTime.Now;
+                        log.FCT_NO = nfpastecard.PASTE_CARD_KEY;
+                        log.FCT_OPER = UserBuffer.UserCode;
+                        log.FCT_OPERTYPE = 1;
+                        log.FCT_REASON = "NF手动打印贴车单操作";
+                        nfpastecard.FailLog = log;
+
+                        string strprodtype = "";
+                        //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置"
+                        if (pFisType == "01")
+                        {
+                            strprodtype = "( 混 )";
+                        }
+                        else if (pFisType == "02")
+                        {
+                            strprodtype = "( 单 )";
+                        }
+                        //提交数据处理
+                        foreach (DataRow dr in tbl.Rows)
+                        {
+                            string PASTECARDNO = dr["PASTECARDNO"].ToString();
+                            if (PASTECARDNO.Substring(2, 8).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                            {
+                                if ((Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length < 4)
+                                {
+                                    int num = 4 - (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length;
+                                    string value = (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                                    string sumValue = "";
+                                    for (var i = 0; i < num; i++)
+                                    {
+                                        sumValue = sumValue + "0";
+                                    }
+                                    if (PASTECARDNO.Substring(2, PASTECARDNO.Length - 6).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                                    {
+                                        PASTECARDNO = PASTECARDNO.Substring(2, PASTECARDNO.Length - 6) + sumValue + value;
+                                    }
+                                    else
+                                    {
+                                        PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                                    }
+                                }
+                                else
+                                {
+                                    if (PASTECARDNO.Substring(2, PASTECARDNO.Length - 6).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                                    {
+                                        PASTECARDNO = PASTECARDNO.Substring(2, PASTECARDNO.Length - 6) + (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                                    }
+                                    else
+                                    {
+                                        PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+
+                            }
+                            nfpastecard.PASTECARDNO = PASTECARDNO;
+                            nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
+                          //  nfpastecard.
+                        }
+                        int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard);
+                        // 打印处理
+                        TJFrmCarCardPrintShow frm = new TJFrmCarCardPrintShow(nfpastecard, strprodtype, "手动");
+                        frm.Owner = this;
+
+                        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
+                {
+                    MessageBox.Show("无打印数据!");
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+            finally
+            {
+                if (isprint)
+                {
+                    nflist = null;
+                    txtCode.Focus();
+
+                    //2016-01-07 增加1号位校验 - 清空1号位
+                    this.placeFirstPosition = "";
+                    this.placeFirstPositionTime = DateTime.MinValue;
+                    //2016-01-07 增加1号位校验
+                }
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region 打印1号位的条码
+        /// <summary>
+        /// 打印1号位的条码
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnFirstPlace_Click(object sender, EventArgs e)
+        {
+            this.dgvMATChange.Rows[0].DefaultCellStyle.BackColor = Color.White;
+            #region 打印
+            DCS.Common.PrintCode printFun = new DCS.Common.PrintCode();
+            //执行打印
+            printFun.PinrtFirstPlaceHU();
+            #endregion
+        }
+        #endregion
+
+        #region 判断当前扫描过的数据集合中是否有相同条码
+        TJEPasteCard ncspastecard = null;
+        /// <summary>
+        /// 判断当前扫描过的数据集合中是否有相同条码
+        /// 与右侧列表中校验，条码是否扫描过
+        /// </summary>
+        /// <param name="strbarcode">扫描的条码</param>
+        private bool CheckDataSet(string strbarcode)
+        {
+            String teshucode = getTeShuBarcode(barcodeidentification);
+            if (nfpastecard != null)
+            {
+                foreach (TJEPasteDetailsCard pe in nfpastecard.DetailsCardlist)
+                {
+                    if (teshucode == strbarcode)
+                    {
+                        continue;
+                    }
+                    if (strbarcode == pe.SANBARCODE)
+                    {
+                        Alert("条码重复：已扫描过的条码，不可以重复扫描。");
+                        ArragetxtCode();
+                        return false;
+                    }
+                }
+            }
+            if (ncspastecard != null)
+            {
+                foreach (TJEPasteDetailsCard pe2 in ncspastecard.DetailsCardlist)
+                {
+                    if (teshucode == strbarcode)
+                    {
+                        continue;
+                    }
+                    if (strbarcode == pe2.SANBARCODE)
+                    {
+                        Alert("条码重复：已扫描过的条码，不可以重复扫描。");
+                        ArragetxtCode();
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        #endregion 
+
+        #region 创建NF的贴车单以及明细(外来件)
+        /// <summary>
+        /// 创建NF的贴车单以及明细(NF开头)
+        /// </summary>
+        private void CreateNFPaste__()
+        {
+            #region
+            if (nfindex == 0)
+            {
+                nflist = new List<TJEPasteDetailsCard>();
+                nfpastcardkey = Guid.NewGuid().ToString();
+                nfpastecard = new TJEPasteCard();
+                nfpastecard.DetailsCardlist = new List<TJEPasteDetailsCard>();
+                nfpastecard.PASTE_CARD_KEY = nfpastcardkey;
+
+                //nfpastecard.PLANTNAME = WORKCENTER_CODE.ToString();
+
+                nfpastecard.PASTECARDNO = "";
+                nfpastecard.PRODUCTIONNAME = pFisType;
+                nfpastecard.PASTECARDDATE = DateTime.Now.ToString();
+                nfpastecard.OPERATOR = UserBuffer.UserCode;
+                nfpastecard.CREATETIME = DateTime.Now.ToString();
+            }
+            TJEPasteDetailsCard pastdetail = new TJEPasteDetailsCard();
+            pastdetail.PASTEDETAILED_CARD_KEY = Guid.NewGuid().ToString();
+            pastdetail.FIS_KEY = strFiskey;
+            pastdetail.PASTE_CARD_KEY = nfpastcardkey;
+            pastdetail.SANBARCODE = txtCode.Text.ToString();
+            pastdetail.SCANDATE = DateTime.Now.ToString();
+            pastdetail.PRODNO = strprodno;
+            pastdetail.CARSETDESC_CN = strcarsetdesc_cn;
+            pastdetail.VIN = strvin;
+            pastdetail.VWSEQ = strvwseq;
+            pastdetail.CP5A = strcp5a;
+            pastdetail.DGVROWINDEX = dgvrowindex;
+            pastdetail.LINENO = strlineno;
+            nfpastecard.DetailsCardlist.Add(pastdetail);
+            nflist.Add(pastdetail);
+            dgvNF.DataMember = null;
+            dgvNF.DataSource = nflist;
+            strprodno = "";
+            nfindex++;
+            int setdefaultSum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", ""]);
+            if (nfindex == setdefaultSum)
+            {
+                EFailLog log = new EFailLog();
+                log.TID = Guid.NewGuid().ToString();
+                log.FCT_DATE = DateTime.Now;
+                log.FCT_NO = nfpastecard.PASTE_CARD_KEY;
+                log.FCT_OPER = UserBuffer.UserCode;
+                log.FCT_OPERTYPE = 1;
+                log.FCT_REASON = "NF贴车单自动打印操作";
+
+                //nfpastecard.PLANTNAME = WORKCENTER_CODE.ToString();
+                nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
+                nfpastecard.PASTECARDNO = CreatePastecardNo(WORKCENTER_CODE.ToString());
+
+                nfpastecard.DetailsCardlist = nflist;
+                nfpastecard.FailLog = log;
+                nfindex = 0;
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_AddPasteCard.ToString(), nfpastecard);
+                //BllFisOrder bllFisOrder = new BllFisOrder();
+                //int rowindex = bllFisOrder.AddPasteCard(nfpastecard);
+                TJPrintPasteCard prin = new TJPrintPasteCard();
+                string strprodtype = "";
+                //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置"
+                if (pFisType == "01")
+                {
+                    strprodtype = "( 混 )";
+                }
+                else if (pFisType == "02")
+                {
+                    strprodtype = "( 单 )";
+               }
+                prin.Print(rowindex, nfpastecard, strprodtype);
+                ClearContainer();
+                GetInitData();
+                DGVRemoveRow(nflist, ref ncslist);
+                dgvNF.DataSource = new List<EPasteDetailsCard>();
+                nfpastecard = null;
+                nflist = null;
+                nfindex = 0;
+                dgvrowindex = 0;
+                computenfncs();
+                GetLastPastCard();
+                SetPastNOConfirm(0);
+                //2016-01-07 增加1号位校验 - 清空1号位
+                this.placeFirstPosition = "";
+                this.placeFirstPositionTime = DateTime.MinValue;
+                //2016-01-07 增加1号位校验
+            }
+            #endregion
+        }
+        #endregion
+
+        #region 计算NF,NCS数量----每条产线的数量
+        /// <summary>
+        /// 计算NF,NCS数量
+        /// </summary>
+        private void computenfncs()
+        {
+            //BindingSource bin = (BindingSource)dgvMATChange.DataSource;
+
+            //DataTable tbl = (DataTable)dgvMATChange.DataSource;
+            //DataRow[] nfrows = tbl.Select("LINENO='NF'");
+            //DataRow[] ncsrows = tbl.Select("LINENO='NCS'");
+            //DataRow[] ncsnfrows = tbl.Select("LINENO='NCSNF'");
+            //DataRow[] ncsgprows = tbl.Select("LINENO='NCSGP'");
+            //lblCount.Text = "NCS: " + ncsrows.Length + " NF: " + nfrows.Length + " NCSNF: " + ncsnfrows.Length + " NCSGP: " + ncsgprows.Length;
+        }
+        #endregion 
+
+       
+        private void Alert(string message, bool openConfirmDialog = true)
+        {
+            PlaySound.PlaySounds.Play(@errorSoundPath);
+            lberror.Text = message;
+            if (openConfirmDialog
+                && string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["AlertConfirmEnable", "0"], "1"))
+            {
+                Common.frmAlertConfirm alertconfirm = new Common.frmAlertConfirm(message, "CD85010800");
+                alertconfirm.StartPosition = FormStartPosition.CenterScreen;
+                alertconfirm.ShowDialog();
+            }
+        }
+      
+
+        #region 与FIS数据匹配
+        /// <summary>
+        /// 与FIS数据匹配
+        /// </summary>
+        private void FISDataCompare(string Code,string MATERIAL_CODE,string MOULD_CODE)
+        {
+
+            int temprowindex = 0;
+
+            int nflistCount = 0;
+            if (nflist != null && nflist.Count > 0)
+            {
+                nflistCount = nflist.Count;
+            }
+            int ncslistCount = 0;
+            if (ncslist != null && ncslist.Count > 0)
+            {
+                ncslistCount = ncslist.Count;
+            }
+            temprowindex = nflistCount + ncslistCount;
+
+            strprodno = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_CODE"].Value.ToString();
+            string pstrprodcno = strprodno;
+            string strmoulecode = dgvMATChange.Rows[temprowindex].Cells["MOULD_CODE"].Value.ToString();
+            // Getmoulecodecode(strmoulecode);
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            //2.判断成品
+            //Product statusRuslt = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCode.ToString(), Code);
+            if (strmoulecode != MOULD_CODE)
+            {
+                SetContainerItem(nfindex, false);
+                Alert("扫描的成品位置与计划位置不符!");
+                txtCode.Text = "";
+                txtCode.Focus();
+                return;
+            }
+            if (MATERIAL_CODE != pstrprodcno)
+            {
+                SetContainerItem(nfindex, false);
+                Alert("扫描的成品零件号与计划零件号不符!");
+                
+                txtCode.Text = "";
+                txtCode.Focus();
+                return;
+            }
+            DataTable tblbarcode = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_ExistBarcode.ToString(), BarcodeTime, Code);
+
+            if (tblbarcode.Rows.Count == 0)
+            {
+                for (; temprowindex < dgvMATChange.Rows.Count; temprowindex++)
+                {
+                    //主键
+                    strFiskey = dgvMATChange.Rows[temprowindex].Cells["PID"].Value.ToString();
+                    //大众顺序号
+                    strvwseq = dgvMATChange.Rows[temprowindex].Cells["REQUESTID"].Value.ToString();
+                    //位置
+                    strmouldcode = dgvMATChange.Rows[temprowindex].Cells["MOULD_CODE"].Value.ToString();
+                    //零件号
+                    strprodno = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_CODE"].Value.ToString();
+                    //总成描述
+                    strcarsetdesc_cn = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_NAME"].Value.ToString();
+                    //车型
+                    strlineno = dgvMATChange.Rows[temprowindex].Cells["LINENO"].Value.ToString();
+
+                    //扫描状态
+                    strscanstat = dgvMATChange.Rows[temprowindex].Cells["STATE"].Value.ToString();
+                    dgvrowindex = temprowindex;
+                    if (strscanstat == "0")
+                    {
+                        strprodno = strprodno.ToString().Trim();
+                        pstrprodcno = pstrprodcno.ToString().Trim();
+                        //if (strprodno == pstrprodcno)
+                        if (pstrprodcno.ToUpper().Replace(".", "").Contains(strprodno.ToUpper().Replace(".", "")))
+                        {
+
+                            this.dgvMATChange.Rows[temprowindex].DefaultCellStyle.BackColor = Color.White;
+
+                            dgvMATChange.Rows[temprowindex].Cells["STATE"].Value = "1";
+
+
+                            break;
+                        }
+                        else
+                        {
+                            SetContainerItem(nfindex, false);
+                            Alert("条码错误：条码的零件号与FIS队列零件号不符合。");
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        SetContainerItem(nfindex, false);
+                        Alert("条码错误：条码已扫描或车型不符合。");
+                        break;
+                    }
+
+                }
+            }
+            else
+            {
+                Alert("扫描条码重复，请重新扫描。");
+            }
+            SetContainerItem(nfindex, true);
+            CreateNFPaste(Code);  //创建NF的贴车单以及明细
+            if (dgvMATChange.RowCount > 0)
+            {
+                dgvMATChange.FirstDisplayedScrollingRowIndex = nfindex - nfindex % 4;
+            }
+            lberror.Text = "";
+        }
+        #endregion 
+
+        #region  扫描条码时触发事件
+        ///// <summary>
+        ///// 扫描条码时触发事件
+        ///// </summary>
+        ///// <param name="sender"></param>
+        ///// <param name="e"></param> 崔法宝20170906
+        private void txtCode_KeyDown(object sender, KeyEventArgs e)
+        {
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            string inputstring = "";
+            try
+            {
+                if (e.KeyCode != Keys.Enter)
+                {
+                    return;
+                }
+                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)
+                {
+                    Alert("当前没有发运计划，请先下计划后再扫描!");
+                    ArragetxtCode();
+                    return;
+                }
+                #endregion 
+
+                #region 一号位校验是否扫描校验
+
+                //2016-01-07 增加1号位校验
+                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 = "";
+                        //处理条码扫描文本框
+                        ArragetxtCode();
+                        return;
+                    }
+                }
+
+                #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))
+                {
+                    this.placeFirstPosition = "";
+                    this.txtCode.Text = "";
+                    lberror.Text = "请先扫描1号位！";
+                    return;
+                }
+                #endregion 
+
+                #region FIS区域数据全部扫描完成，请获取数据后再扫描
+                if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count)
+                {
+                    Alert("当前计划数据全部扫描完成，请下达计划后再扫描!");
+                    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 (txtCode.Text.Length <= ll || txtCode.Text.Length >= ul)
+                //{
+                //    Alert("条码错误：条码长度不符合要求（" + ll.ToString() + "-" + ul.ToString() + "）。");
+
+                //    ArragetxtCode();
+                //    return;
+                //}
+                #endregion
+
+                #region 校验位计算
+                
+                if (txtCode.Text.StartsWith("052"))
+                {
+                    string codepart = txtCode.Text.Substring(0, txtCode.Text.Length - 1).ToUpper();
+                    string checksum = txtCode.Text.Substring(txtCode.Text.Length-1,1).ToUpper();
+                    if (!string.Equals(checksum, CalculateChecksum(codepart)))
+                    {
+                        Alert("条码错误：总成条码校验位错误！");
+
+                        ArragetxtCode();
+                        return;
+                    }
+                }
+                #endregion
+
+                #region 判断扫描条形码是否存在 获取扫描条码
+                string Code = txtCode.Text.Trim().ToUpper();
+
+                #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() == Code)
+                        {
+                            SetContainerItem(nfindex, false);
+                            Alert("该条码已扫描!");
+                            txtCode.Text = "";
+                            txtCode.Focus();
+                            return;
+                        }
+                    }
+                }
+                #endregion 
+
+                //规则
+                bool signal = false;
+                string outSourceProduct = "";
+                string MOULD_CODE = "";
+                foreach (var rule in _barcodeRules)
+                {
+                    if (System.Text.RegularExpressions.Regex.IsMatch(Code, rule.REGEX))
+                    {
+                        signal = true;
+                        ProMaterial = rule.MATERIAL_CODE;
+                        outSourceProduct = rule.DATA_TYPE;
+                        MOULD_CODE = rule.REMARK;
+                    }
+                }
+                if (signal != false)
+                {
+                    //规则表里没有则去数据库里查找是否存在(VW371 bc316产品)
+                    //if (System.Text.RegularExpressions.Regex.IsMatch(Code, "^DP\\w+(-\\w+)?-DF[LR][FR]\\w+$"))//扫描输入为门板计划标签
+                    //{
+                    //    //从计划标签中截取产品码
+                    //    Code = Code.Substring(Code.LastIndexOf('-') + 1);
+                    //}
+                    #region 去数据库查询相关产品信息，外来零件忽略此步骤
+                    //Product product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetProductByAssembleCode.ToString(), Code);
+
+                    //if (product != null)
+                    //{
+                    //    Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
+                    //}
+                    //else
+                    //{
+                    //    Alert("未查询到该产品零件信息:" + Code + "。");
+                    //    //清理文本框
+                    //    ArragetxtCode();
+                    //    return;
+                    //}
+
+                    #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() == Code)
+                            {
+                                SetContainerItem(nfindex, false);
+                                Alert("该条码已扫描!");
+                                txtCode.Text = "";
+                                txtCode.Focus();
+                                return;
+                            }
+                        }
+                    }
+
+                    //-------------------------End-----------
+                    #endregion
+                    //int ExitResult = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetExitsCode.ToString(), Code);
+                    //if ((product == null || string.IsNullOrEmpty(product.PID)))
+                    //{
+                    //    SetContainerItem(nfindex, false);
+                    //    Alert("扫描的产品条码不存在,请重新扫描！");
+                    //    txtCode.Text = "";
+                    //    txtCode.Focus();
+                    //    return;
+                    //}
+                    //Object statusRuslt = agent.InvokeServiceFunction<object>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetExitsStatus.ToString(), Code);
+
+                    #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数据匹配
+                    FISDataCompare(Code, ProMaterial, MOULD_CODE);
+
+                    #endregion
+                    #endregion
+                }
+                else
+                {
+                    Alert("条码正则未查询到零件号!");
+                    txtCode.Text = "";
+                    txtCode.Focus();
+                    return;
+                }
+
+                #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["VIN"].Value.ToString().Substring(10, 7));
+                    //vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["VIN"].Value.ToString().Substring(10, 7));
+                    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 
+
+                txtCode.Text = "";
+                txtCode.Focus();
+            }
+            catch (Exception ex)
+            {
+                //MessageBox.Show(ex.Message);
+                lberror.Text = ex.Message;
+            }
+            finally
+            {
+                if (!string.IsNullOrWhiteSpace(inputstring))
+                    WriteLog.WriteShipmentLog(string.Format("{0}\t{1}\t{2}", DateTime.Now, inputstring, lberror.Text));
+                dgvMATChange.ClearSelection();
+            }
+        }
+        #endregion 
+
+        #region 执行CMD码
+        /// <summary>
+        /// 执行CMD码
+        /// </summary>
+        private void ExcuteCMDCode()
+        {
+            string cmd = txtCode.Text.Trim().Split(':')[1];
+            switch (cmd)
+            {
+                case "CLOSECART"://强制提交
+                    {
+                        CloseCart(cmd);
+                        break;
+                    }
+                case "RESETCART"://重扫器具 
+                    {
+                        ResetCart();
+                        break;
+                    }
+                case "FORCESCAN"://强制扫描 
+                    {
+                        ForceScan(cmd);
+                        break;
+                    }
+                default:
+                    {
+                        Alert("未知指令！",false);
+                        _CMDConfirm = "";
+                        break;
+                    }
+            }
+        }
+        #endregion 
+
+        #region 强制扫描 将下一次扫描的物料验证
+        /// <summary>
+        /// 强制扫描 将下一次扫描的物料验证
+        /// </summary>
+        /// <param name="cmd"></param>
+        private void ForceScan(string cmd)
+        {
+            if (_CMDConfirm == cmd)//指令二次确认
+            {
+                //CreatePaste();
+                lberror.Text = "";
+                _CMDConfirm = "";
+            }
+            else
+            {
+                Alert("确定要提交此贴车单？请再次扫描指令码确认。");
+                _CMDConfirm = cmd;
+            }
+        }
+        #endregion 
+
+        #region 手动提交贴车单-在器具未满情况下使用
+        /// <summary>
+        /// 手动提交贴车单-在器具未满情况下使用
+        /// </summary>
+        /// <param name="cmd"></param>
+        private void CloseCart(string cmd)
+        {
+            if (!btnCloseCart.Enabled)
+            {
+                Alert("您没有进行此操作的权限！", false);
+                _CMDConfirm = "";
+                return;
+            }
+            if (nflist == null)
+            {
+                Alert("需要至少扫描一件产品才能提交贴车单！",false);
+                _CMDConfirm = "";
+                return;
+            }
+            if (_CMDConfirm == cmd)//指令二次确认
+            {
+                lberror.Text = "";
+                _CMDConfirm = "";
+                CreatePaste();
+            }
+            else
+            {
+                Alert("确定要提交此贴车单？请再次扫描指令码确认。",false);
+                _CMDConfirm = cmd;
+            }
+        }
+        #endregion 
+
+        #region 根据条码标识查询零件信息(无用)
+        /// <summary>
+        /// 根据条码标识查询零件信息
+        /// </summary>
+        /// <param name="strbarcode"></param>
+        private DataTable GetSparepartsinfo(string strbarcode)
+        {
+            //根据条码前3位去零件表查询条码标识查找零件号。包括的数据有052、NF1、NF2、NF3、NF4。车型，指NF或NCS。
+            // BllFisOrder bllFisOrder = new BllFisOrder();
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            //----------2015-02-10 王丹丹 修改（条码规则变更，所以查询零件号的条件也变更）----------------
+            if (strbarcode.Substring(0, 3) != "052")
+            {
+                //如果前3位不是"052",截取条码前3位进行查询
+                //return bllFisOrder.GetSparepartsinfo(strbarcode.Substring(0, 3));
+                return agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetSparepartsinfo.ToString(), strbarcode.Substring(0, 3));
+            }
+            else
+            {
+                //如果前3位是"052",截取条码前8位进行查询
+                //return bllFisOrder.GetSparepartsinfo(strbarcode.Substring(0, 8));
+                return agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetSparepartsinfo.ToString(), strbarcode.Substring(0, 8));
+            }
+            //--------------------------------------------------------------------------------------------
+        }
+        #endregion 
+
+        #region 判断数据库中是否有相同的条码
+        //条码标识
+        string barcodeidentification = "";
+        /// <summary>
+        /// 判断数据库中是否有相同的条码
+        /// </summary>
+        /// <param name="strbarcode">扫描条码</param>
+        private void CheckDataBase(string strbarcode)
+        {
+            barcodeidentification = "";
+            //特殊条码，当丢失条码或者条码损坏时，扫描一个特殊条码
+            string specialbarcode = "";
+            // BllFisOrder bllFisOrder = new BllFisOrder();
+            //根据条码标识获取零件信息
+            //DataTable tbl = GetSparepartsinfo(strbarcode);
+            //if (tbl.Rows.Count > 0)
+            //{
+            //    barcodeidentification = tbl.Rows[0]["BARCODEIDENTIFICATION"].ToString();
+            //}
+            //else
+            //{
+            //    PlaySound.PlaySounds.Play(@errorSoundPath);
+            //    lberror.Text = "条码错误：无法根据条码识别零件号";
+            //}
+            //if (getTeShuBarcode(barcodeidentification) == strbarcode)
+            //{
+            //    specialbarcode = "SPECIALBARCODE";
+            //}
+
+            //DataTable tblbarcode = bllFisOrder.ExistBarcode(BarcodeTime, strbarcode);
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tblbarcode = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_ExistBarcode.ToString(), BarcodeTime, strbarcode);
+
+            if (tblbarcode.Rows.Count == 0 || specialbarcode == "SPECIALBARCODE")
+            {
+                //d.AddDays(-40)+"00:00:00";
+
+                #region "校验：根据条码获取零件号"
+                //if (tbl.Rows.Count > 0)
+                //{
+                    //零件号
+                    //string strkhprodno = tbl.Rows[0]["CUSTOMERSPAREPARTS"].ToString();
+                    string strkhprodno = ProMaterial;
+                    //01,02
+                    //string templineno = tbl.Rows[0]["CODENAME"].ToString();
+                    string templineno = "02";
+                    //车型
+                    //string vehicletype = tbl.Rows[0][1].ToString();
+                    GetCruentFisData(strbarcode, strkhprodno, templineno, nfpastecard, ncspastecard);
+                    //判断当前FIS队列中的零件号，是否等于条码标识获取的零件号。
+                    //if (strkhprodno == strprodno)
+                    if (strkhprodno.ToUpper().Replace(".", "").Contains(strprodno.ToUpper().Replace(".", "")))
+                    {
+                        SetContainerItem(nfindex, true);
+                        CreateNFPaste(strbarcode);
+                    }
+                    else
+                    {
+                        Alert("条码错误：扫描的条码与FIS中的零件不符。");
+                    }
+                //}
+                //else
+                //{
+                //    PlaySound.PlaySounds.Play(@errorSoundPath);
+                //    lberror.Text = "条码错误：无法根据条码识别零件号。";
+                //}
+                #endregion
+            }
+            else
+            {
+                Alert("扫描条码重复，请重新扫描。");
+            }
+        }
+        #endregion 
+
+        #region 光标聚焦
+        /// <summary>
+        /// 光标聚焦
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtCode_Leave(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtCode.Text))
+            {
+                txtCode.Focus();
+            }
+        }
+        #endregion 
+
+        #region 获取FIS发货数据的当前行
+        /// <summary>
+        /// 获取FIS发货数据的当前行
+        /// </summary>
+        private void GetCruentFisData(string pstrbarcode, string pstrprodcno, string ptemplineno, TJEPasteCard pnfpascard, TJEPasteCard pncspascard)
+        {
+            #region
+            if (dgvMATChange.Rows.Count != 0)
+            {
+                //if (ptemplineno == "NCS")
+                //{
+                //    if (ncslist == null)
+                //    {
+                //        DGVCurrontRow(pstrprodcno, ptemplineno, 0);
+                //    }
+                //    else
+                //    {
+                //        int rowcount = ncslist.Count;
+                //        int temprowindex = ncslist[rowcount - 1].DGVROWINDEX + 1;
+                //        DGVCurrontRow(pstrprodcno, ptemplineno, temprowindex);
+                //    }
+                //}
+                //if (ptemplineno == "NF")
+                //{
+                //    if (nflist == null)
+                //    {
+                //        DGVCurrontRow(pstrprodcno, ptemplineno, 0);
+                //    }
+                //    else
+                //    {
+                //        int rowcount = nflist.Count;
+                //        int temprowindex = nflist[rowcount - 1].DGVROWINDEX + 1;
+                //        DGVCurrontRow(pstrprodcno, ptemplineno, temprowindex);
+                //    }
+                //}
+                if (nflist == null)
+                {
+                    DGVCurrontRow(pstrprodcno, ptemplineno, 0);
+                }
+                else
+                {
+                    int rowcount = nflist.Count;
+                    int temprowindex = nflist[rowcount - 1].DGVROWINDEX + 1;
+                    DGVCurrontRow(pstrprodcno, ptemplineno, temprowindex);
+                }
+
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region  根据零件号，车型获取当前要发货的FIS信息(外来件)
+        /// <summary>
+        /// 根据零件号，车型获取当前要发货的FIS信息
+        /// </summary>
+        /// <param name="pstrprodcno"></param>
+        /// <param name="ptemplineno"></param>
+        /// <param name="rowindex"></param>
+        private void DGVCurrontRow(string pstrprodcno, string ptemplineno, int rowindex)
+        {
+            #region
+
+            for (; rowindex < dgvMATChange.Rows.Count; rowindex++)
+            {
+                //主键
+                //strFiskey = dgvMATChange.Rows[rowindex].Cells["clFiskey"].Value.ToString();
+                strFiskey = dgvMATChange.Rows[rowindex].Cells["PID"].Value.ToString();
+                //大众顺序号
+                strvwseq = dgvMATChange.Rows[rowindex].Cells["REQUESTID"].Value.ToString();
+                //零件号
+                strprodno = dgvMATChange.Rows[rowindex].Cells["PRODNO"].Value.ToString();
+                //总成描述
+                strcarsetdesc_cn = dgvMATChange.Rows[rowindex].Cells["CARSETDESC_CN"].Value.ToString();
+                //上线时间
+                strcp5a = dgvMATChange.Rows[rowindex].Cells["CP5A"].Value.ToString();
+                //车型
+                strlineno = dgvMATChange.Rows[rowindex].Cells["LINENO"].Value.ToString();
+                //车身号
+                strkin = dgvMATChange.Rows[rowindex].Cells["KIN"].Value.ToString();
+                //底盘号
+                strvin = dgvMATChange.Rows[rowindex].Cells["VIN"].Value.ToString();
+
+
+                //扫描状态
+                strscanstat = dgvMATChange.Rows[rowindex].Cells[clscanstate.Name].Value.ToString();
+                dgvrowindex = rowindex;
+                if (strscanstat == "0" )//&& strlineno == ptemplineno
+                {
+                    strprodno = strprodno.ToString().Trim();
+                    pstrprodcno = pstrprodcno.ToString().Trim();
+                    //if (strprodno == pstrprodcno)
+                    if (pstrprodcno.ToUpper().Replace(".", "").Contains(strprodno.ToUpper().Replace(".", "")))
+                    {
+                        //2016-01-21 wangqingnan 如果行变色则不重新刷颜色
+                        //DataGridViewCellStyle ds = new DataGridViewCellStyle();
+                        //ds.BackColor = Color.White;
+                        //this.dgvMATChange.Rows[rowindex].DefaultCellStyle = ds;
+                        this.dgvMATChange.Rows[rowindex].DefaultCellStyle.BackColor = Color.White;
+                        //2016-01-21 wangqingnan 如果行变色则不重新刷颜色
+                        dgvMATChange.Rows[rowindex].Cells[clscanstate.Name].Value = "1";
+                        break;
+                    }
+                    else
+                    {
+                        Alert("条码错误：条码的零件号与FIS队列零件号不符合。");
+                        break;
+                    }
+                }
+                else
+                {
+                    Alert("条码错误：条码已扫描或车型不符合。");
+                    break;
+                }
+
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region 创建NF的贴车单以及明细（vw371）
+        TJEPasteCard nfpastecard = null;
+        /// <summary>
+        /// 创建NF的贴车单以及明细
+        /// </summary>
+        private void CreateNFPaste(string barcode)
+        {
+            #region
+            if (nfindex == 0)
+            {
+                nflist = new List<TJEPasteDetailsCard>();
+                nfpastcardkey = Guid.NewGuid().ToString();
+                nfpastecard = new TJEPasteCard();
+                nfpastecard.DetailsCardlist = new List<TJEPasteDetailsCard>();
+                nfpastecard.PASTE_CARD_KEY = nfpastcardkey;
+                nfpastecard.PASTECARDNO = "";
+                nfpastecard.PRODUCTIONNAME = pFisType;
+                nfpastecard.PASTECARDDATE = DateTime.Now.ToString();
+                nfpastecard.OPERATOR = UserBuffer.UserCode;
+                nfpastecard.CREATETIME = DateTime.Now.ToString();
+                nfpastecard.PLANTNAME = pFisType.ToString();
+
+            }
+            TJEPasteDetailsCard pastdetail = new TJEPasteDetailsCard();
+            pastdetail.PASTEDETAILED_CARD_KEY = Guid.NewGuid().ToString();
+            pastdetail.FIS_KEY = strFiskey;
+            pastdetail.PASTE_CARD_KEY = nfpastcardkey;
+            //为扫描记录关联产品主键 张鹏 2018-3-8
+            pastdetail.SANBARCODE = barcode;// txtCode.Text.ToString();
+            //pastdetail.PRODUCT_PID = product.PID;
+
+            pastdetail.SCANDATE = DateTime.Now.ToString();
+            pastdetail.PRODNO = strprodno;
+            pastdetail.CARSETDESC_CN = strcarsetdesc_cn;
+            pastdetail.VIN = strvin;
+            pastdetail.VWSEQ = strvwseq;
+            //pastdetail.CP5A = strcp5a;
+            //pastdetail.KIN = strkin;
+            
+            pastdetail.DGVROWINDEX = dgvrowindex;
+            pastdetail.LINENO = strlineno;
+            pastdetail.MOULDCODE = strmouldcode;
+            nfpastecard.DetailsCardlist.Add(pastdetail);
+            nflist.Add(pastdetail);
+            dgvNF.DataMember = null;
+            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)
+            {
+                EFailLog log = new EFailLog();
+                log.TID = Guid.NewGuid().ToString();
+                log.FCT_DATE = DateTime.Now;
+                log.FCT_NO = nfpastecard.PASTE_CARD_KEY;
+                log.FCT_OPER = UserBuffer.UserCode;
+                log.FCT_OPERTYPE = 1;
+                log.FCT_REASON = "NF贴车单自动打印操作";
+                nfpastecard.DetailsCardlist = nflist;
+                nfpastecard.FailLog = log;
+                nfindex = 0;
+
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetDaspssteCarIndexByPlanName.ToString(), nfpastecard.PLANTNAME.ToString());
+                
+                if (tbl.Rows.Count == 0)
+                {
+                    nfpastecard.PASTECARDNO = WORKCENTER_CODE + DateTime.Now.ToString("yyyyMMdd") + "0001";
+                    int delResult = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_InsertDaspssteCarIndexByPlanName.ToString(), nfpastecard);
+                }
+                else
+                {
+                    foreach (DataRow dr in tbl.Rows)
+                    {
+                        string PASTECARDNO = dr["PASTECARDNO"].ToString();
+                        string PLANTNAME = dr["PLANTNAME"].ToString();
+
+                        if ((Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length < 4)
+                        {
+                            int num = 4 - (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length;
+                            string value = (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                            string sumValue = "";
+                            for (var i = 0; i < num; i++)
+                            {
+                                sumValue = sumValue + "0";
+                            }
+
+                            if (PASTECARDNO.Substring(PLANTNAME.Length, PASTECARDNO.Length - PLANTNAME.Length - 4).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                            {
+                                PASTECARDNO = PASTECARDNO.Substring(PLANTNAME.Length, PASTECARDNO.Length - PLANTNAME.Length - 4) + sumValue + value;
+                            }
+                            else
+                            {
+                                PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                            }
+
+                        }
+                        else
+                        {
+                            if (PASTECARDNO.Substring(PLANTNAME.Length, PASTECARDNO.Length - PLANTNAME.Length - 4).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                            {
+                                PASTECARDNO = PASTECARDNO.Substring(PLANTNAME.Length, PASTECARDNO.Length - PLANTNAME.Length - 4) + (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                            }
+                            else
+                            {
+                                PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+
+                            }
+                        }
+                        nfpastecard.PASTECARDNO = PLANTNAME + PASTECARDNO;
+                        nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
+                    }
+                }
+                
+                int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard, setdefaultSum);
+
+
+                Print();//手动提交打印功能
+
+                ClearContainer();
+                GetInitData();
+                DGVRemoveRow(nflist, ref ncslist);
+                dgvNF.DataSource = new List<EPasteDetailsCard>();
+                nfpastecard = null;
+                nflist = null;
+                nfindex = 0;
+                dgvrowindex = 0;
+
+                //computenfncs();
+                //2016-01-07 增加1号位校验 - 清空1号位
+                //this.placeFirstPosition = "";
+                //this.placeFirstPositionTime = DateTime.MinValue;
+                //2016-01-07 增加1号位校验
+                GetLastPastCard();
+                SetPastNOConfirm(0);
+
+            }
+            #endregion
+        }
+        #endregion 
+
+        #region 创建贴车单(不满车提交）
+        /// <summary>
+        /// 创建贴车单(不满车提交）
+        /// </summary>
+        private void CreatePaste()
+        {
+            if (nflist == null)
+            {
+                Alert("无数据，请先按FIS顺序扫描产品！",false);
+                return;
+            }
+
+            EFailLog log = new EFailLog();
+            log.TID = Guid.NewGuid().ToString();
+            log.FCT_DATE = DateTime.Now;
+            log.FCT_NO = nfpastecard.PASTE_CARD_KEY;
+            log.FCT_OPER = UserBuffer.UserCode;
+            log.FCT_OPERTYPE = 1;
+            log.FCT_REASON = "NF贴车单自动打印操作";
+            nfpastecard.DetailsCardlist = nflist;
+            nfpastecard.FailLog = log;
+            nfindex = 0;
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetDaspssteCarIndexByPlanName.ToString(), nfpastecard.PLANTNAME.ToString());
+            if (tbl.Rows.Count == 0)
+            {
+                nfpastecard.PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+                int delResult = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_InsertDaspssteCarIndexByPlanName.ToString(), nfpastecard);
+            }
+            else
+            {
+
+                foreach (DataRow dr in tbl.Rows)
+                {
+                    string PASTECARDNO = dr["PASTECARDNO"].ToString();
+                    string PLANTNAME = dr["PLANTNAME"].ToString();
+
+                    if ((Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length < 4)
+                    {
+                        int num = 4 - (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString().Length;
+                        string value = (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                        string sumValue = "";
+                        for (var i = 0; i < num; i++)
+                        {
+                            sumValue = sumValue + "0";
+                        }
+
+                        string ii = PASTECARDNO.Substring(PLANTNAME.Length, 8).ToString();
+
+                        if (PASTECARDNO.Substring(PLANTNAME.Length, 8).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                        {
+                            PASTECARDNO = PLANTNAME + PASTECARDNO.Substring(PLANTNAME.Length - PLANTNAME.Length, 6) + sumValue + value;
+                        }
+                        else
+                        {
+                            PASTECARDNO = PLANTNAME + DateTime.Now.ToString("yyyyMMdd") + "0001";
+                        }
+
+                    }
+                    else
+                    {
+                        if (PASTECARDNO.Substring(2, PASTECARDNO.Length - 6).ToString() == DateTime.Now.ToString("yyyyMMdd"))
+                        {
+                            PASTECARDNO = PASTECARDNO.Substring(2, PASTECARDNO.Length - 6) + (Convert.ToInt32(PASTECARDNO.Substring(PASTECARDNO.Length - 4, 4)) + 1).ToString();
+                        }
+                        else
+                        {
+                            PASTECARDNO = DateTime.Now.ToString("yyyyMMdd") + "0001";
+
+                        }
+                    }
+
+                    nfpastecard.PASTECARDNO = PASTECARDNO;
+                    nfpastecard.OPERATOR = ClientContext.LoginInfo.UserName.ToString();
+
+                }
+            }
+            int setdefaultSum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", ""]);
+            int rowindex = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_AddNewPasteCard.ToString(), nfpastecard, setdefaultSum);
+
+            Print();//手动提交打印功能
+
+            ClearContainer();
+            GetInitData();
+            DGVRemoveRow(nflist, ref ncslist);
+            dgvNF.DataSource = new List<EPasteDetailsCard>();
+            nfpastecard = null;
+            nflist = null;
+            nfindex = 0;
+            dgvrowindex = 0;
+
+            GetLastPastCard();
+            SetPastNOConfirm(0);
+
+        }
+        #endregion 
+
+        #region 打印功能
+        /// <summary>
+        /// 打印功能
+        /// </summary>
+        private void Print()
+        {
+            //int PrintDisable = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["PrintDisable", "1"]);
+
+            //if (PrintDisable == 1)
+            //{
+            //    lberror.Text = "贴车单打印已禁用！";
+            //    return;
+            //}
+
+            TJPrintPasteCard prin = new TJPrintPasteCard();
+            string strprodtype = "";
+            if (pFisType == "01")
+            {
+                strprodtype = "( 混 )";
+            }
+            else if (pFisType == "02")
+            {
+                strprodtype = "( 单 )";
+            }
+
+            DataTable dt = new DataTable();
+            dt.Columns.Add("ROWINDEX");
+            dt.Columns.Add("VWSEQ");
+            dt.Columns.Add("VIN");
+            dt.Columns.Add("PRODNO");
+            dt.Columns.Add("CARSETDESCCN");
+            dt.Columns.Add("PASTECARDNO");
+            dt.Columns.Add("SCANDATE");
+            dt.Columns.Add("PRODUCTIONNAME");
+            dt.Columns.Add("LINENO");
+            int index = 1;
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            //DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardDeatis.ToString());
+            DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), nfpastecard.PASTE_CARD_KEY);
+                
+            //index = Convert.ToInt32(tbl.Rows[0][0].ToString());
+            for (var i = 0; i < tbl.Rows.Count; i++)
+            {
+                DataRow ncsdr = dt.NewRow();
+                ncsdr["ROWINDEX"] = index.ToString(); ;
+                ncsdr["VWSEQ"] = tbl.Rows[i]["VWSEQ"].ToString();
+                ncsdr["VIN"] = tbl.Rows[i]["VIN"].ToString();
+                ncsdr["PRODNO"] = tbl.Rows[i]["PRODNO"].ToString();
+                ncsdr["CARSETDESCCN"] = tbl.Rows[i]["CARSETDESC_CN"].ToString();
+                ncsdr["PASTECARDNO"] = tbl.Rows[i]["PASTECARDNO"].ToString();;
+                ncsdr["SCANDATE"] = DateTime.Now.ToString();
+                ncsdr["PRODUCTIONNAME"] = strprodtype;
+                ncsdr["LINENO"] = tbl.Rows[i]["LINENO"].ToString();
+                dt.Rows.Add(ncsdr);
+                index++;
+            }
+            prin.Print(dt);
+            //MessageBox.Show("打印成功！");
+            lberror.Text = "贴车单已打印";
+
+        }
+        #endregion 
+
+        #region 定时刷新数据
+        /// <summary>
+        /// 定时刷新数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void timeRefew_Tick(object sender, EventArgs e)
+        {
+            //if (dgvNF.Rows.Count == 0)
+            //{
+                GetInitData();
+            //}
+        }
+        #endregion 
+
+        #region 扫描件状态框动作
+        /// <summary>
+        /// 
+        /// </summary>
+        public void InitContainer()
+        {
+            tpContainer.Controls.Clear();
+            tpContainer.RowStyles.Clear();
+            tpContainer.ColumnStyles.Clear();
+
+            int defaultNum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", "6"]);
+            int rowcount = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["RowCount", "2"]);
+
+            tpContainer.RowCount = rowcount;
+            tpContainer.ColumnCount = defaultNum / rowcount + (defaultNum % rowcount > 0 ? 1 : 0);
+
+            for (int i = 0; i < tpContainer.RowCount; i++)
+            {
+                if (i == 0)
+                {
+                    tpContainer.RowStyles.Add(new RowStyle(SizeType.Percent, 50));
+                }
+                else
+                {
+                    tpContainer.RowStyles.Add(new RowStyle(SizeType.Percent, 50));
+                }
+            }
+            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();
+                    lblItem.Text = (i*rowcount+j+ 1).ToString();
+                    lblItem.Font = new Font("微软雅黑", 24, FontStyle.Bold);
+                    lblItem.Dock = DockStyle.Fill;
+                    lblItem.TextAlign = ContentAlignment.MiddleCenter;
+                    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);
+            }
+
+
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="itemindex"></param>
+        /// <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)
+            {
+                label.BackColor = result ? Color.Lime : Color.Red;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void ClearContainer()
+        {
+            foreach (var ctrl in tpContainer.Controls)
+            {
+                var label = ctrl as Label;
+                if (label != null)
+                {
+                    label.BackColor = tpContainer.BackColor;
+                }
+            }
+        }
+        #endregion
+
+        #region 重新扫描
+        /// <summary>
+        /// 重新扫描
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnResetCart_Click(object sender, EventArgs e)
+        {
+            ResetCart();
+        }
+        private void ResetCart()
+        {
+            if (!btnResetCart.Enabled)
+            {
+                lberror.Text = "您无权执行此操作！";
+            }
+            nflist = null;
+            nfindex = 0;
+            ClearContainer();
+            GetInitData();
+            //DGVRemoveRow(nflist, ref ncslist);
+            dgvNF.DataSource = new List<EPasteDetailsCard>();
+            nfpastecard = null;
+
+            dgvrowindex = 0;
+            if (dgvMATChange.RowCount > 0)
+            {
+                dgvMATChange.FirstDisplayedScrollingRowIndex = nfindex - nfindex % 4;
+            }
+        }
+        #endregion 
+
+        #region 混线单选按钮
+        /// <summary>
+        /// 混线单选按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        int signal = 0;
+        private void rb_hx_CheckedChanged(object sender, EventArgs e)
+        {
+            if (dgvNF.Rows.Count > 0)
+            {
+                if (rb_hx.Checked == true && signal == 0)
+                {
+                    signal++;
+                    rb_dx.Checked = true;
+                }
+                else if (rb_dx.Checked == true && signal == 0)
+                {
+                    signal++;
+                    rb_hx.Checked = true;
+                }
+                lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!";
+                signal = 0;
+                return;
+            }
+            lberror.Text = "";
+            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = rb_hx.Checked ? "01" : "02";
+            if (this.rb_hx.Checked == true)
+            {
+                //混
+                pFisType = "01";
+                WORKCENTER_CODE = "IPFY01";
+            }
+            else
+            {   //单
+                pFisType = "02";
+                WORKCENTER_CODE = "IPFY02";
+            }
+            GetInitData();
+        }
+
+        #endregion 
+
+        #region 工作中心设置按钮
+        /// <summary>
+        /// 工作中心设置按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnLineSetting_Click(object sender, EventArgs e)
+        {
+            TJfrmLineSetting frm = new TJfrmLineSetting();
+            frm.Owner = this;
+            frm.ShowDialog();
+            txtCode.Focus();
+        }
+        #endregion 
+
+        #region 贴车单顺序校正按钮
+        /// <summary>
+        /// 贴车单顺序校正按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnResetIndex_Click(object sender, EventArgs e)
+        {
+            TJResetSendIndexForm form = new TJResetSendIndexForm();
+            form.ShowDialog();
+
+            txtCode.Focus();
+        }
+        #endregion 
+
+        #region 设置容器容量
+        /// <summary>
+        /// 设置容器容量
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSetDatagroupType_Click(object sender, EventArgs e)
+        {
+            TJDefaultDataSetNum window = new TJDefaultDataSetNum();
+            window.Owner = this;
+            window.Show();
+        }
+        #endregion 
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void FrmPlace_Activated(object sender, EventArgs e)
+        {
+            SetRowColor();
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        private string getTeShuBarcode(String str)
+        {
+            return str + " 4XR#" + DateTime.Now.ToString("MMddHH") + "#";
+        }
+
+        #region 不满车打印贴车单
+        /// <summary>
+        /// 不满车打印贴车单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnCloseCart_Click(object sender, EventArgs e)
+        {
+            lberror.Text = "";
+            _CMDConfirm = "";
+            CreatePaste();
+        }
+        #endregion 
+
+        public static string CalculateChecksum(string barcode)
+        {
+            string chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%";
+            int sum = 0;
+            foreach (var c in barcode)
+            {
+                sum += chars.IndexOf(c);
+            }
+            int rem = sum % chars.Length;
+            return chars[rem].ToString();
+        }
+
+        /// <summary>
+        /// 位置名称转换code
+        /// </summary>
+        /// <param name="Name"></param>
+        /// <returns></returns>
+        public static string Getmoulecodecode(string Name)
+        {
+            switch (Name)
+            {
+                case "左前":
+                    return "LF";
+                case "左后":
+                    return "LR";
+                case "右前":
+                    return "RF";
+                case "右后":
+                    return "RR";
+                default:
+                    break;
+            }
+            return "";
+        }
+
+
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs
new file mode 100644
index 0000000..703a6d0
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs
@@ -0,0 +1,866 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJFrmPlace
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.panel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnLineSetting = new System.Windows.Forms.Button();
+            this.btnSetDatagroupType = new System.Windows.Forms.Button();
+            this.btnSearch = new System.Windows.Forms.Button();
+            this.btnJZ = new System.Windows.Forms.Button();
+            this.btnRef = new System.Windows.Forms.Button();
+            this.rb_hx = new System.Windows.Forms.RadioButton();
+            this.rb_dx = new System.Windows.Forms.RadioButton();
+            this.lblCount = new System.Windows.Forms.Label();
+            this.dgvMATChange = new System.Windows.Forms.DataGridView();
+            this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MATERIAL_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MATERIAL_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LINENO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MOULD_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.clscanstate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.STATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.dgvNF = new System.Windows.Forms.DataGridView();
+            this.tpContainer = new System.Windows.Forms.TableLayoutPanel();
+            this.panel3 = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnPrint_NF = new System.Windows.Forms.Button();
+            this.btnResetIndex = new System.Windows.Forms.Button();
+            this.btnResetCart = new System.Windows.Forms.Button();
+            this.btnCloseCart = new System.Windows.Forms.Button();
+            this.btnFirstPlace = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.lblLastPastNO = new System.Windows.Forms.Label();
+            this.pbPastNoConfirmed = new System.Windows.Forms.PictureBox();
+            this.lberror = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtCode = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.splitter1 = new System.Windows.Forms.Splitter();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.timeRefew = new System.Windows.Forms.Timer(this.components);
+            this.panel7 = new System.Windows.Forms.Panel();
+            this.panel8 = new System.Windows.Forms.Panel();
+            this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMATChange)).BeginInit();
+            this.panel6.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.panel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvNF)).BeginInit();
+            this.panel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPastNoConfirmed)).BeginInit();
+            this.panel5.SuspendLayout();
+            this.panel7.SuspendLayout();
+            this.panel8.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.splitContainer1);
+            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox2.Font = new System.Drawing.Font("宋体", 9F);
+            this.groupBox2.Location = new System.Drawing.Point(0, 0);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(770, 692);
+            this.groupBox2.TabIndex = 10;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "FIS数据";
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(3, 17);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.panel1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.dgvMATChange);
+            this.splitContainer1.Size = new System.Drawing.Size(764, 672);
+            this.splitContainer1.SplitterDistance = 70;
+            this.splitContainer1.TabIndex = 8;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.btnLineSetting);
+            this.panel1.Controls.Add(this.btnSetDatagroupType);
+            this.panel1.Controls.Add(this.btnSearch);
+            this.panel1.Controls.Add(this.btnJZ);
+            this.panel1.Controls.Add(this.btnRef);
+            this.panel1.Controls.Add(this.rb_hx);
+            this.panel1.Controls.Add(this.rb_dx);
+            this.panel1.Controls.Add(this.lblCount);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(764, 70);
+            this.panel1.TabIndex = 7;
+            // 
+            // btnLineSetting
+            // 
+            this.btnLineSetting.AutoSize = true;
+            this.btnLineSetting.Location = new System.Drawing.Point(3, 3);
+            this.btnLineSetting.Name = "btnLineSetting";
+            this.btnLineSetting.Size = new System.Drawing.Size(91, 23);
+            this.btnLineSetting.TabIndex = 11;
+            this.btnLineSetting.Text = "发运设置";
+            this.btnLineSetting.UseVisualStyleBackColor = true;
+            this.btnLineSetting.Click += new System.EventHandler(this.btnLineSetting_Click);
+            // 
+            // btnSetDatagroupType
+            // 
+            this.btnSetDatagroupType.AutoSize = true;
+            this.btnSetDatagroupType.Location = new System.Drawing.Point(100, 3);
+            this.btnSetDatagroupType.Name = "btnSetDatagroupType";
+            this.btnSetDatagroupType.Size = new System.Drawing.Size(107, 23);
+            this.btnSetDatagroupType.TabIndex = 13;
+            this.btnSetDatagroupType.Text = "设置器具容量";
+            this.btnSetDatagroupType.UseVisualStyleBackColor = true;
+            this.btnSetDatagroupType.Click += new System.EventHandler(this.btnSetDatagroupType_Click);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.AutoSize = true;
+            this.btnSearch.Location = new System.Drawing.Point(213, 3);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(75, 23);
+            this.btnSearch.TabIndex = 8;
+            this.btnSearch.Text = "贴车单查询";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // btnJZ
+            // 
+            this.btnJZ.AutoSize = true;
+            this.btnJZ.Location = new System.Drawing.Point(294, 3);
+            this.btnJZ.Name = "btnJZ";
+            this.btnJZ.Size = new System.Drawing.Size(96, 23);
+            this.btnJZ.TabIndex = 9;
+            this.btnJZ.Text = "计划挂起";
+            this.btnJZ.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.btnJZ.UseVisualStyleBackColor = true;
+            this.btnJZ.Click += new System.EventHandler(this.btnJZ_Click);
+            // 
+            // btnRef
+            // 
+            this.btnRef.AutoSize = true;
+            this.btnRef.Location = new System.Drawing.Point(396, 3);
+            this.btnRef.Name = "btnRef";
+            this.btnRef.Size = new System.Drawing.Size(105, 23);
+            this.btnRef.TabIndex = 9;
+            this.btnRef.Text = "刷新FIS数据";
+            this.btnRef.UseVisualStyleBackColor = true;
+            this.btnRef.Click += new System.EventHandler(this.btnRef_Click);
+            // 
+            // rb_hx
+            // 
+            this.rb_hx.AutoSize = true;
+            this.rb_hx.Checked = true;
+            this.rb_hx.Location = new System.Drawing.Point(507, 3);
+            this.rb_hx.Name = "rb_hx";
+            this.rb_hx.Size = new System.Drawing.Size(71, 16);
+            this.rb_hx.TabIndex = 7;
+            this.rb_hx.TabStop = true;
+            this.rb_hx.Text = "左侧门板";
+            this.rb_hx.UseVisualStyleBackColor = true;
+            this.rb_hx.CheckedChanged += new System.EventHandler(this.rb_hx_CheckedChanged);
+            // 
+            // rb_dx
+            // 
+            this.rb_dx.AutoSize = true;
+            this.rb_dx.Location = new System.Drawing.Point(584, 3);
+            this.rb_dx.Name = "rb_dx";
+            this.rb_dx.Size = new System.Drawing.Size(71, 16);
+            this.rb_dx.TabIndex = 6;
+            this.rb_dx.Text = "右侧门板";
+            this.rb_dx.UseVisualStyleBackColor = true;
+            // 
+            // lblCount
+            // 
+            this.lblCount.AutoSize = true;
+            this.lblCount.Dock = System.Windows.Forms.DockStyle.Left;
+            this.lblCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblCount.Location = new System.Drawing.Point(663, 0);
+            this.lblCount.Margin = new System.Windows.Forms.Padding(5, 0, 0, 0);
+            this.lblCount.Name = "lblCount";
+            this.lblCount.Size = new System.Drawing.Size(0, 29);
+            this.lblCount.TabIndex = 21;
+            this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // dgvMATChange
+            // 
+            this.dgvMATChange.AllowUserToAddRows = false;
+            this.dgvMATChange.AllowUserToDeleteRows = false;
+            this.dgvMATChange.AllowUserToOrderColumns = true;
+            this.dgvMATChange.AllowUserToResizeRows = false;
+            this.dgvMATChange.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
+            this.dgvMATChange.BackgroundColor = System.Drawing.Color.White;
+            this.dgvMATChange.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.dgvMATChange.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvMATChange.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.PLAN_DATE,
+            this.REQUESTID,
+            this.MATERIAL_CODE,
+            this.MATERIAL_NAME,
+            this.LINENO,
+            this.MOULD_CODE,
+            this.PID,
+            this.clscanstate,
+            this.STATE});
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F);
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0);
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvMATChange.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvMATChange.Location = new System.Drawing.Point(0, 0);
+            this.dgvMATChange.MultiSelect = false;
+            this.dgvMATChange.Name = "dgvMATChange";
+            this.dgvMATChange.ReadOnly = true;
+            this.dgvMATChange.RowHeadersWidth = 40;
+            this.dgvMATChange.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvMATChange.RowTemplate.DefaultCellStyle.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0);
+            this.dgvMATChange.RowTemplate.Height = 23;
+            this.dgvMATChange.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvMATChange.Size = new System.Drawing.Size(764, 598);
+            this.dgvMATChange.TabIndex = 5;
+            this.dgvMATChange.TabStop = false;
+            this.dgvMATChange.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvMATChange_RowPostPaint);
+            // 
+            // PLAN_DATE
+            // 
+            this.PLAN_DATE.DataPropertyName = "PLAN_DATE";
+            this.PLAN_DATE.HeaderText = "计划时间";
+            this.PLAN_DATE.Name = "PLAN_DATE";
+            this.PLAN_DATE.ReadOnly = true;
+            this.PLAN_DATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PLAN_DATE.Width = 74;
+            // 
+            // REQUESTID
+            // 
+            this.REQUESTID.DataPropertyName = "SEQ";
+            this.REQUESTID.HeaderText = "顺序号";
+            this.REQUESTID.Name = "REQUESTID";
+            this.REQUESTID.ReadOnly = true;
+            this.REQUESTID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.REQUESTID.Width = 62;
+            // 
+            // MATERIAL_CODE
+            // 
+            this.MATERIAL_CODE.DataPropertyName = "MATERIAL_CODE";
+            this.MATERIAL_CODE.HeaderText = "零件号";
+            this.MATERIAL_CODE.Name = "MATERIAL_CODE";
+            this.MATERIAL_CODE.ReadOnly = true;
+            this.MATERIAL_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MATERIAL_CODE.Width = 62;
+            // 
+            // MATERIAL_NAME
+            // 
+            this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME";
+            this.MATERIAL_NAME.HeaderText = "总成描述";
+            this.MATERIAL_NAME.Name = "MATERIAL_NAME";
+            this.MATERIAL_NAME.ReadOnly = true;
+            this.MATERIAL_NAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MATERIAL_NAME.Width = 74;
+            // 
+            // LINENO
+            // 
+            this.LINENO.DataPropertyName = "LINENO";
+            this.LINENO.HeaderText = "车型";
+            this.LINENO.Name = "LINENO";
+            this.LINENO.ReadOnly = true;
+            this.LINENO.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.LINENO.Width = 50;
+            // 
+            // MOULD_CODE
+            // 
+            this.MOULD_CODE.DataPropertyName = "MOULD_CODE";
+            this.MOULD_CODE.HeaderText = "位置";
+            this.MOULD_CODE.Name = "MOULD_CODE";
+            this.MOULD_CODE.ReadOnly = true;
+            this.MOULD_CODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MOULD_CODE.Width = 50;
+            // 
+            // PID
+            // 
+            this.PID.DataPropertyName = "PID";
+            this.PID.HeaderText = "PID";
+            this.PID.Name = "PID";
+            this.PID.ReadOnly = true;
+            this.PID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PID.Visible = false;
+            this.PID.Width = 44;
+            // 
+            // clscanstate
+            // 
+            this.clscanstate.DataPropertyName = "SCANSTATE";
+            this.clscanstate.HeaderText = "扫描状态";
+            this.clscanstate.Name = "clscanstate";
+            this.clscanstate.ReadOnly = true;
+            this.clscanstate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.clscanstate.Visible = false;
+            this.clscanstate.Width = 74;
+            // 
+            // STATE
+            // 
+            this.STATE.DataPropertyName = "STATE";
+            this.STATE.HeaderText = "STATE";
+            this.STATE.Name = "STATE";
+            this.STATE.ReadOnly = true;
+            this.STATE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.STATE.Visible = false;
+            this.STATE.Width = 56;
+            // 
+            // panel6
+            // 
+            this.panel6.Controls.Add(this.groupBox1);
+            this.panel6.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel6.Location = new System.Drawing.Point(773, 0);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(466, 692);
+            this.panel6.TabIndex = 18;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.panel4);
+            this.groupBox1.Controls.Add(this.panel3);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox1.Location = new System.Drawing.Point(0, 0);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(466, 692);
+            this.groupBox1.TabIndex = 9;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "已扫描数据";
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.dgvNF);
+            this.panel4.Controls.Add(this.tpContainer);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel4.Location = new System.Drawing.Point(3, 87);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(460, 602);
+            this.panel4.TabIndex = 15;
+            // 
+            // dgvNF
+            // 
+            this.dgvNF.AllowUserToAddRows = false;
+            this.dgvNF.AllowUserToDeleteRows = false;
+            this.dgvNF.AllowUserToResizeRows = false;
+            this.dgvNF.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
+            this.dgvNF.BackgroundColor = System.Drawing.Color.White;
+            this.dgvNF.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.dgvNF.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvNF.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.CODE_NF,
+            this.PRODNO_NF,
+            this.CARSETDESC_CN_NF,
+            this.MOULDCODE,
+            this.CREATEDATE_NF,
+            this.Column1,
+            this.SEQ,
+            this.Column2,
+            this.Column3,
+            this.Column7,
+            this.Column11,
+            this.Column13,
+            this.dgcPRODUCT_PID});
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvNF.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvNF.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvNF.Location = new System.Drawing.Point(0, 0);
+            this.dgvNF.Name = "dgvNF";
+            this.dgvNF.ReadOnly = true;
+            this.dgvNF.RowHeadersWidth = 50;
+            this.dgvNF.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.dgvNF.RowTemplate.Height = 27;
+            this.dgvNF.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvNF.Size = new System.Drawing.Size(460, 364);
+            this.dgvNF.TabIndex = 0;
+            // 
+            // tpContainer
+            // 
+            this.tpContainer.BackColor = System.Drawing.SystemColors.ControlDark;
+            this.tpContainer.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.OutsetDouble;
+            this.tpContainer.ColumnCount = 1;
+            this.tpContainer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tpContainer.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tpContainer.Location = new System.Drawing.Point(0, 364);
+            this.tpContainer.Name = "tpContainer";
+            this.tpContainer.RowCount = 1;
+            this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F));
+            this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F));
+            this.tpContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 235F));
+            this.tpContainer.Size = new System.Drawing.Size(460, 238);
+            this.tpContainer.TabIndex = 0;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.btnPrint_NF);
+            this.panel3.Controls.Add(this.btnResetIndex);
+            this.panel3.Controls.Add(this.btnResetCart);
+            this.panel3.Controls.Add(this.btnCloseCart);
+            this.panel3.Controls.Add(this.btnFirstPlace);
+            this.panel3.Controls.Add(this.label1);
+            this.panel3.Controls.Add(this.lblLastPastNO);
+            this.panel3.Controls.Add(this.pbPastNoConfirmed);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel3.Location = new System.Drawing.Point(3, 17);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(460, 70);
+            this.panel3.TabIndex = 14;
+            // 
+            // btnPrint_NF
+            // 
+            this.btnPrint_NF.Location = new System.Drawing.Point(3, 3);
+            this.btnPrint_NF.Name = "btnPrint_NF";
+            this.btnPrint_NF.Size = new System.Drawing.Size(75, 26);
+            this.btnPrint_NF.TabIndex = 11;
+            this.btnPrint_NF.Text = "贴车单打印";
+            this.btnPrint_NF.UseVisualStyleBackColor = true;
+            this.btnPrint_NF.Visible = false;
+            this.btnPrint_NF.Click += new System.EventHandler(this.btnPrint_NF_Click);
+            // 
+            // btnResetIndex
+            // 
+            this.btnResetIndex.Location = new System.Drawing.Point(84, 3);
+            this.btnResetIndex.Name = "btnResetIndex";
+            this.btnResetIndex.Size = new System.Drawing.Size(102, 26);
+            this.btnResetIndex.TabIndex = 15;
+            this.btnResetIndex.Text = "贴车单顺序校正";
+            this.btnResetIndex.UseVisualStyleBackColor = true;
+            this.btnResetIndex.Click += new System.EventHandler(this.btnResetIndex_Click);
+            // 
+            // btnResetCart
+            // 
+            this.btnResetCart.Location = new System.Drawing.Point(192, 3);
+            this.btnResetCart.Name = "btnResetCart";
+            this.btnResetCart.Size = new System.Drawing.Size(95, 26);
+            this.btnResetCart.TabIndex = 18;
+            this.btnResetCart.Text = "重扫当前器具";
+            this.btnResetCart.UseVisualStyleBackColor = true;
+            this.btnResetCart.Click += new System.EventHandler(this.btnResetCart_Click);
+            // 
+            // btnCloseCart
+            // 
+            this.btnCloseCart.Location = new System.Drawing.Point(293, 3);
+            this.btnCloseCart.Name = "btnCloseCart";
+            this.btnCloseCart.Size = new System.Drawing.Size(95, 26);
+            this.btnCloseCart.TabIndex = 19;
+            this.btnCloseCart.Text = "强制提交";
+            this.btnCloseCart.UseVisualStyleBackColor = true;
+            this.btnCloseCart.Click += new System.EventHandler(this.btnCloseCart_Click);
+            // 
+            // btnFirstPlace
+            // 
+            this.btnFirstPlace.Location = new System.Drawing.Point(3, 35);
+            this.btnFirstPlace.Name = "btnFirstPlace";
+            this.btnFirstPlace.Size = new System.Drawing.Size(75, 26);
+            this.btnFirstPlace.TabIndex = 17;
+            this.btnFirstPlace.Text = "1号位打印";
+            this.btnFirstPlace.UseVisualStyleBackColor = true;
+            this.btnFirstPlace.Click += new System.EventHandler(this.btnFirstPlace_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(85, 32);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(94, 34);
+            this.label1.TabIndex = 20;
+            this.label1.Text = "前车贴车单:";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblLastPastNO
+            // 
+            this.lblLastPastNO.AutoSize = true;
+            this.lblLastPastNO.Dock = System.Windows.Forms.DockStyle.Left;
+            this.lblLastPastNO.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLastPastNO.Location = new System.Drawing.Point(185, 32);
+            this.lblLastPastNO.Name = "lblLastPastNO";
+            this.lblLastPastNO.Size = new System.Drawing.Size(0, 34);
+            this.lblLastPastNO.TabIndex = 23;
+            this.lblLastPastNO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // pbPastNoConfirmed
+            // 
+            this.pbPastNoConfirmed.Image = global::QMAPP.WinForm.Resource1.help;
+            this.pbPastNoConfirmed.Location = new System.Drawing.Point(191, 35);
+            this.pbPastNoConfirmed.Name = "pbPastNoConfirmed";
+            this.pbPastNoConfirmed.Size = new System.Drawing.Size(28, 28);
+            this.pbPastNoConfirmed.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pbPastNoConfirmed.TabIndex = 22;
+            this.pbPastNoConfirmed.TabStop = false;
+            // 
+            // lberror
+            // 
+            this.lberror.AutoSize = true;
+            this.lberror.BackColor = System.Drawing.Color.Red;
+            this.lberror.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lberror.ForeColor = System.Drawing.Color.White;
+            this.lberror.Location = new System.Drawing.Point(476, 6);
+            this.lberror.Name = "lberror";
+            this.lberror.Size = new System.Drawing.Size(0, 36);
+            this.lberror.TabIndex = 13;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.Red;
+            this.label2.Location = new System.Drawing.Point(378, 17);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(114, 20);
+            this.label2.TabIndex = 14;
+            this.label2.Text = "消息区域：";
+            // 
+            // txtCode
+            // 
+            this.txtCode.Font = new System.Drawing.Font("宋体", 20F);
+            this.txtCode.ImeMode = System.Windows.Forms.ImeMode.Disable;
+            this.txtCode.Location = new System.Drawing.Point(108, 6);
+            this.txtCode.Name = "txtCode";
+            this.txtCode.Size = new System.Drawing.Size(264, 38);
+            this.txtCode.TabIndex = 1;
+            this.txtCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown);
+            this.txtCode.Leave += new System.EventHandler(this.txtCode_Leave);
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(9, 17);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(93, 20);
+            this.label4.TabIndex = 12;
+            this.label4.Text = "扫描条码";
+            // 
+            // splitter1
+            // 
+            this.splitter1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.splitter1.Location = new System.Drawing.Point(770, 0);
+            this.splitter1.Name = "splitter1";
+            this.splitter1.Size = new System.Drawing.Size(3, 692);
+            this.splitter1.TabIndex = 17;
+            this.splitter1.TabStop = false;
+            // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.groupBox2);
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel5.Location = new System.Drawing.Point(0, 0);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(770, 692);
+            this.panel5.TabIndex = 16;
+            // 
+            // timeRefew
+            // 
+            this.timeRefew.Enabled = true;
+            this.timeRefew.Tick += new System.EventHandler(this.timeRefew_Tick);
+            // 
+            // panel7
+            // 
+            this.panel7.Controls.Add(this.panel5);
+            this.panel7.Controls.Add(this.splitter1);
+            this.panel7.Controls.Add(this.panel6);
+            this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel7.Location = new System.Drawing.Point(0, 50);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(1239, 692);
+            this.panel7.TabIndex = 9;
+            // 
+            // panel8
+            // 
+            this.panel8.Controls.Add(this.lberror);
+            this.panel8.Controls.Add(this.label4);
+            this.panel8.Controls.Add(this.label2);
+            this.panel8.Controls.Add(this.txtCode);
+            this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel8.Location = new System.Drawing.Point(0, 0);
+            this.panel8.Name = "panel8";
+            this.panel8.Size = new System.Drawing.Size(1239, 50);
+            this.panel8.TabIndex = 19;
+            // 
+            // CODE_NF
+            // 
+            this.CODE_NF.DataPropertyName = "SANBARCODE";
+            this.CODE_NF.HeaderText = "条码号";
+            this.CODE_NF.Name = "CODE_NF";
+            this.CODE_NF.ReadOnly = true;
+            this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CODE_NF.Width = 57;
+            // 
+            // PRODNO_NF
+            // 
+            this.PRODNO_NF.DataPropertyName = "PRODNO";
+            this.PRODNO_NF.HeaderText = "零件号";
+            this.PRODNO_NF.Name = "PRODNO_NF";
+            this.PRODNO_NF.ReadOnly = true;
+            this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PRODNO_NF.Width = 57;
+            // 
+            // CARSETDESC_CN_NF
+            // 
+            this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN";
+            this.CARSETDESC_CN_NF.HeaderText = "总成描述";
+            this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF";
+            this.CARSETDESC_CN_NF.ReadOnly = true;
+            this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CARSETDESC_CN_NF.Width = 69;
+            // 
+            // MOULDCODE
+            // 
+            this.MOULDCODE.DataPropertyName = "MOULDCODE";
+            this.MOULDCODE.HeaderText = "位置";
+            this.MOULDCODE.Name = "MOULDCODE";
+            this.MOULDCODE.ReadOnly = true;
+            this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MOULDCODE.Width = 45;
+            // 
+            // CREATEDATE_NF
+            // 
+            this.CREATEDATE_NF.DataPropertyName = "SCANDATE";
+            this.CREATEDATE_NF.HeaderText = "扫描时间";
+            this.CREATEDATE_NF.Name = "CREATEDATE_NF";
+            this.CREATEDATE_NF.ReadOnly = true;
+            this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CREATEDATE_NF.Width = 69;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY";
+            this.Column1.HeaderText = "Column1";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Visible = false;
+            this.Column1.Width = 82;
+            // 
+            // SEQ
+            // 
+            this.SEQ.DataPropertyName = "SEQ";
+            this.SEQ.HeaderText = "SEQ";
+            this.SEQ.Name = "SEQ";
+            this.SEQ.ReadOnly = true;
+            this.SEQ.Visible = false;
+            this.SEQ.Width = 58;
+            // 
+            // Column2
+            // 
+            this.Column2.DataPropertyName = "FIS_KEY";
+            this.Column2.HeaderText = "Column2";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.Visible = false;
+            this.Column2.Width = 82;
+            // 
+            // Column3
+            // 
+            this.Column3.DataPropertyName = "PASTE_CARD_KEY";
+            this.Column3.HeaderText = "Column3";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Visible = false;
+            this.Column3.Width = 82;
+            // 
+            // Column7
+            // 
+            this.Column7.DataPropertyName = "VIN";
+            this.Column7.HeaderText = "Column7";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Visible = false;
+            this.Column7.Width = 82;
+            // 
+            // Column11
+            // 
+            this.Column11.DataPropertyName = "DGVROWINDEX";
+            this.Column11.HeaderText = "Column11";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.Visible = false;
+            this.Column11.Width = 88;
+            // 
+            // Column13
+            // 
+            this.Column13.DataPropertyName = "LINENO";
+            this.Column13.HeaderText = "Column13";
+            this.Column13.Name = "Column13";
+            this.Column13.ReadOnly = true;
+            this.Column13.Visible = false;
+            this.Column13.Width = 88;
+            // 
+            // dgcPRODUCT_PID
+            // 
+            this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID";
+            this.dgcPRODUCT_PID.HeaderText = "产品主键";
+            this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID";
+            this.dgcPRODUCT_PID.ReadOnly = true;
+            this.dgcPRODUCT_PID.Visible = false;
+            this.dgcPRODUCT_PID.Width = 88;
+            // 
+            // TJFrmPlace
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1239, 742);
+            this.Controls.Add(this.panel7);
+            this.Controls.Add(this.panel8);
+            this.Name = "TJFrmPlace";
+            this.Text = "发运终端";
+            this.Activated += new System.EventHandler(this.FrmPlace_Activated);
+            this.Load += new System.EventHandler(this.FrmElevateRequest_Load);
+            this.groupBox2.ResumeLayout(false);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvMATChange)).EndInit();
+            this.panel6.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.panel4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvNF)).EndInit();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPastNoConfirmed)).EndInit();
+            this.panel5.ResumeLayout(false);
+            this.panel7.ResumeLayout(false);
+            this.panel8.ResumeLayout(false);
+            this.panel8.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.FlowLayoutPanel panel1;
+        private System.Windows.Forms.Button btnLineSetting;
+        private System.Windows.Forms.Button btnSearch;
+        private System.Windows.Forms.Button btnJZ;
+        private System.Windows.Forms.Button btnRef;
+        private System.Windows.Forms.RadioButton rb_hx;
+        private System.Windows.Forms.RadioButton rb_dx;
+        private System.Windows.Forms.DataGridView dgvMATChange;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.DataGridView dgvNF;
+        private System.Windows.Forms.FlowLayoutPanel panel3;
+        private System.Windows.Forms.Button btnResetIndex;
+        private System.Windows.Forms.Button btnPrint_NF;
+        private System.Windows.Forms.Label lberror;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtCode;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Splitter splitter1;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Timer timeRefew;
+        private System.Windows.Forms.Button btnFirstPlace;
+        private System.Windows.Forms.Button btnSetDatagroupType;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.TableLayoutPanel tpContainer;
+        private System.Windows.Forms.Button btnResetCart;
+        private System.Windows.Forms.Button btnCloseCart;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label lblLastPastNO;
+        private System.Windows.Forms.PictureBox pbPastNoConfirmed;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.Panel panel8;
+        private System.Windows.Forms.Label lblCount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PLAN_DATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn REQUESTID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_CODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LINENO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MOULD_CODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clscanstate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn STATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CODE_NF;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PRODNO_NF;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CARSETDESC_CN_NF;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MOULDCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CREATEDATE_NF;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SEQ;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dgcPRODUCT_PID;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx
new file mode 100644
index 0000000..1f3dbcf
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.resx
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="PLAN_DATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="REQUESTID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MATERIAL_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MATERIAL_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LINENO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MOULD_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clscanstate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="STATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CODE_NF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PRODNO_NF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CARSETDESC_CN_NF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MOULDCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATEDATE_NF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SEQ.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dgcPRODUCT_PID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="timeRefew.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs
new file mode 100644
index 0000000..7039026
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.cs
@@ -0,0 +1,178 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.269
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    using System;
+    using System.ComponentModel;
+    using CrystalDecisions.Shared;
+    using CrystalDecisions.ReportSource;
+    using CrystalDecisions.CrystalReports.Engine;
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    public class TJPastCard : ReportClass {
+        /// <summary>
+        /// 
+        /// </summary>
+        public TJPastCard() {
+        }
+        
+        public override string ResourceName {
+            get {
+                return "TJPastCard.rpt";
+            }
+            set {
+                // Do nothing
+            }
+        }
+        
+        public override bool NewGenerator {
+            get {
+                return true;
+            }
+            set {
+                // Do nothing
+            }
+        }
+        
+        public override string FullResourceName {
+            get {
+                return "QMAPP.WinForm.Forms.TianJin.TJPastCard.rpt";
+            }
+            set {
+                // Do nothing
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section Section1 {
+            get {
+                return this.ReportDefinition.Sections[0];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section Section2 {
+            get {
+                return this.ReportDefinition.Sections[1];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section GroupHeaderSection1 {
+            get {
+                return this.ReportDefinition.Sections[2];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section Section3 {
+            get {
+                return this.ReportDefinition.Sections[3];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section GroupFooterSection1 {
+            get {
+                return this.ReportDefinition.Sections[4];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section Section4 {
+            get {
+                return this.ReportDefinition.Sections[5];
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public CrystalDecisions.CrystalReports.Engine.Section Section5 {
+            get {
+                return this.ReportDefinition.Sections[6];
+            }
+        }
+    }
+    /// <summary>
+    /// 
+    /// </summary>
+    [System.Drawing.ToolboxBitmapAttribute(typeof(CrystalDecisions.Shared.ExportOptions), "report.bmp")]
+    public class TJCachedPastCard : Component, ICachedReport {
+        /// <summary>
+        /// 
+        /// </summary>
+        public TJCachedPastCard() {
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsCacheable {
+            get {
+                return true;
+            }
+            set {
+                // 
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public virtual bool ShareDBLogonInfo {
+            get {
+                return false;
+            }
+            set {
+                // 
+            }
+        }
+        
+        [Browsable(false)]
+        [DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public virtual System.TimeSpan CacheTimeOut {
+            get {
+                return CachedReportConstants.DEFAULT_TIMEOUT;
+            }
+            set {
+                // 
+            }
+        }
+        
+        public virtual CrystalDecisions.CrystalReports.Engine.ReportDocument CreateReport() {
+            TJPastCard rpt = new TJPastCard();
+            rpt.Site = this.Site;
+            return rpt;
+        }
+        
+        public virtual string GetCustomizedCacheKey(RequestContext request) {
+            String key = null;
+            // // The following is the code used to generate the default
+            // // cache key for caching report jobs in the ASP.NET Cache.
+            // // Feel free to modify this code to suit your needs.
+            // // Returning key == null causes the default cache key to
+            // // be generated.
+            // 
+            // key = RequestContext.BuildCompleteCacheKey(
+            //     request,
+            //     null,       // sReportFilename
+            //     this.GetType(),
+            //     this.ShareDBLogonInfo );
+            return key;
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
new file mode 100644
index 0000000000000000000000000000000000000000..f5bbbb452dbd0de4ae12dae86da456bebf34ae0c
GIT binary patch
literal 753664
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
z184(i184(i184(i184(i184(i184(i184(i184(i184(i184(i184(i184(i184(i
P184(i184((Zv+1T#JSPk

literal 0
HcmV?d00001

diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCardModel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCardModel.cs
new file mode 100644
index 0000000..d5abd9f
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCardModel.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    /// <summary>
+    /// 贴车单报表模型
+    /// </summary>
+    public class TJPastCardModel
+    {
+        /// <summary>
+        /// 贴车单号
+        /// </summary>
+        public string PastCardNo { get; set; }
+        public string PastCardTitle { get; set; }
+        public List<FJC.Entity.TianJin.TJFISORDER> PastCardDetail { get; set; }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs
new file mode 100644
index 0000000..10bbfbd
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+using Model;
+using QMAPP.WinForm.Forms.DisPatch;
+using QMAPP.WinForm.Forms.TianJin;
+
+namespace DCS.Place
+{
+    public class TJPrintPasteCard
+    {
+        /// <summary>
+        /// 创建汇总列表
+        /// </summary>
+        /// <returns></returns>
+        private DataTable CreateTablePrepre()
+        {
+            #region
+            DataTable table = new DataTable();
+
+            table.Columns.Add("ROWINDEX");    //序号
+            table.Columns.Add("VWSEQ");    //
+            table.Columns.Add("VIN");         //到货单号条码
+            table.Columns.Add("PRODNO");      //零件号
+            table.Columns.Add("CARSETDESCCN");    //总成描述
+            table.Columns.Add("CP5A");//上线时间
+            table.Columns.Add("SCANDATE");          //打印时间
+            table.Columns.Add("PASTECARDNO");          //贴车单号
+            table.Columns.Add("PASTECARDNOSUB");          //贴车单号
+            table.Columns.Add("PASTECARDNOYS");          //贴车单号
+            table.Columns.Add("PRODUCTIONNAME");        //单线混线
+            table.Columns.Add("LINENO");
+
+            return table;
+            #endregion
+        }
+        /// <summary>
+        /// 外来件打印
+        /// </summary>
+        /// <param name="strindex"></param>
+        /// <param name="nfpastecard"></param>
+        /// <param name="producttype"></param>
+        public void Print(int strindex, TJEPasteCard nfpastecard, string producttype)
+        {
+            DataTable dt = CreateTablePrepre();
+            //BllFisOrder fisorder = new BllFisOrder();
+            //DataTable tbl = fisorder.GetPastecardDeatis();
+            //int strindex = int.Parse (tbl.Rows[0][0].ToString());
+            foreach (TJEPasteDetailsCard pastdetail in nfpastecard.DetailsCardlist)
+            {
+                DataRow ncsdr = dt.NewRow();
+                ncsdr["ROWINDEX"] = strindex;
+                ncsdr["VWSEQ"] = pastdetail.VWSEQ;
+                ncsdr["VIN"] = pastdetail.VIN;
+                ncsdr["PRODNO"] = pastdetail.PRODNO;
+                ncsdr["CARSETDESCCN"] = pastdetail.CARSETDESC_CN;
+                ncsdr["CP5A"] = pastdetail.CP5A;
+                ncsdr["PASTECARDNOYS"] = nfpastecard.PASTECARDNO;
+                ncsdr["PASTECARDNO"] = nfpastecard.PASTECARDNO;
+                ncsdr["PASTECARDNOSUB"] = nfpastecard.PASTECARDNO.Substring(nfpastecard.PASTECARDNO.Length - 4);
+                ncsdr["SCANDATE"] = DateTime.Now.ToString();
+                ncsdr["PRODUCTIONNAME"] = producttype;
+                ncsdr["LINENO"] = pastdetail.LINENO;
+                dt.Rows.Add(ncsdr);
+                strindex++;
+                //fisorder.UpdatePasteDetails(ncsdr["ROWINDEX"].ToString(), pastdetail.PASTEDETAILED_CARD_KEY);
+            }
+
+            TJPastCard cr = new TJPastCard();
+            try
+            {
+                cr.SetDataSource(dt);   //为报表的数据表填充记录
+                //暂时注销
+                cr.PrintToPrinter(1, false, 0, 0);
+            }
+            catch (Exception ex)
+            {
+                QMAPP.WinForm.WriteLog.WriteError(ex.Message);
+            }
+            finally
+            {
+                if (cr != null)
+                {
+                    cr.Close();
+                    cr.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 本地打印
+        /// </summary>
+        /// <param name="printdt"></param>
+        public void Print(DataTable printdt)
+        {
+            TJPastCard cr=null;
+            try
+            {
+                cr = new TJPastCard();
+
+                // printdt.TableName = "text";
+                cr.SetDataSource(printdt);   //为报表的数据表填充记录
+                cr.PrintToPrinter(1, false, 0, 1);
+            }
+            catch (Exception ex)
+            {
+                QMAPP.WinForm.WriteLog.WriteError(ex.Message);
+            }
+            finally
+            {
+                if (cr != null)
+                {
+                    cr.Close();
+                    cr.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.cs
new file mode 100644
index 0000000..c13e8e3
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    public partial class TJResetSendIndexForm : Form
+    { //最后的发车时间
+        DateTime updateTime;
+
+        //发车单号
+        string pasteCardIndex;
+
+        DataTable dt;
+        public TJResetSendIndexForm()
+        {
+            InitializeComponent();
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            string selectPlantCode = comboBox1.Text.ToString();
+            int sendIndex = Convert.ToInt32(numericUpDown1.Value);
+
+            if (sendIndex > 10000)
+            {
+                MessageBox.Show("当前发车数量不能大于9999!");
+                numericUpDown1.Focus();
+                return;
+            }
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardIndex.ToString(), selectPlantCode, selectPlantCode + DateTime.Now.ToString("yyyyMMdd"));
+
+
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow dr in dt.Rows)
+                {
+                    //    string plantCodeInRow = dr["PLANTCODE"].ToString();
+
+                    //    if (selectPlantCode == plantCodeInRow)
+                    //    {
+                    pasteCardIndex = dr["PASTECARDNO"].ToString();
+                    updateTime = Convert.ToDateTime(dr["PASTECARDDATE"]);
+                    //    }
+                }
+
+
+                if (Convert.ToDateTime(updateTime.ToString("yyyy-MM-dd")) > Convert.ToDateTime(label2.Text))
+                {
+                    label2.Text = System.DateTime.Now.ToString("yyyy-MM-dd");
+                    numericUpDown1.Value = Convert.ToInt32(pasteCardIndex.Substring(pasteCardIndex.Length - 4, 4));
+                    MessageBox.Show("请重新修改当前发车数量!");
+                    numericUpDown1.Focus();
+                    return;
+                }
+
+                if (Convert.ToDateTime(updateTime.ToString("yyyy-MM-dd")) == Convert.ToDateTime(label2.Text) && sendIndex < Convert.ToInt32(pasteCardIndex.Substring(pasteCardIndex.Length - 4, 4)))
+                {
+                    numericUpDown1.Value = Convert.ToInt32(pasteCardIndex.Substring(pasteCardIndex.Length - 4, 4));
+                    MessageBox.Show("请重新修改当前发车数量!");
+                    numericUpDown1.Focus();
+                    return;
+                }
+
+                // pasteCardIndex = pasteCardIndex.Substring(0, 2) + label2.Text.Replace("-", "") + numericUpDown1.Value.ToString().PadLeft(4, '0');
+                pasteCardIndex = label2.Text.Replace("-", "") + numericUpDown1.Value.ToString().PadLeft(4, '0');
+                int result = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_UpdatePastecardIndex.ToString(), selectPlantCode+pasteCardIndex, selectPlantCode);
+                this.Close();
+            }
+            else
+            {
+                string strnum=sendIndex.ToString().PadLeft(4,'0');
+                pasteCardIndex = System.DateTime.Now.ToString("yyyyMMdd") + strnum;
+                int result2 = agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_UpdatePastecardIndex.ToString(), selectPlantCode + pasteCardIndex, selectPlantCode);
+                this.Close();
+
+            }
+
+        }
+
+        private void ResetSendIndexForm_Load(object sender, EventArgs e)
+        {
+            //string pFisType = QM.Config.CustomConfig.GetItem("FlashProCode");
+            string pFisType = QMAPP.WinForm.Common.LocalSetting.Settings["PlantNameConfig"];
+            label2.Text = System.DateTime.Now.ToString("yyyy-MM-dd");
+
+
+
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardIndex.ToString(), "", "");
+            this.comboBox1.DataSource = dt;
+            this.comboBox1.DisplayMember = "PLANTNAME";
+            this.comboBox1.ValueMember = "PLANTNAME";
+            comboBox1.SelectedValue = pFisType;
+
+
+
+            int i = 0;
+
+            foreach (DataRow dr in dt.Rows)
+            {
+                if (i >= 1)
+                {
+                    break;
+
+                }
+                string plantNo = dr["PLANTCODE"].ToString();
+                pasteCardIndex = dr["PASTECARDNO"].ToString();
+                updateTime = Convert.ToDateTime(dr["PASTECARDDATE"]);
+                i++;
+            }
+
+            if (updateTime.ToString("yyyy-MM-dd") != label2.Text)
+            {
+                numericUpDown1.Value = 0;
+            }
+            else
+            {
+                numericUpDown1.Value = Convert.ToInt32(pasteCardIndex.Substring(pasteCardIndex.Length - 4, 4));
+            }
+        }
+
+        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (comboBox1.Text != "System.Data.DataRowView")
+            {
+                string selectPlantCode = comboBox1.Text;
+
+                // string selectPlantCode = comboBox1.SelectedValue.ToString();
+                //foreach (DataRow dr in dt.Rows)
+                //{
+                //    string plantCodeInRow = dr["PLANTCODE"].ToString();
+
+                //    if (selectPlantCode == plantCodeInRow)
+                //    {
+                //        string cardIndex = dr["PASTECARDNO"].ToString();
+                //        DateTime updateTimeRow = Convert.ToDateTime(dr["PASTECARDDATE"]);
+
+                //        if (updateTimeRow.ToString("yyyy-MM-dd") != label2.Text)
+                //        {
+                //            numericUpDown1.Value = 0;
+                //        }
+                //        else
+                //        {
+
+
+
+                QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                dt = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardIndex.ToString(), selectPlantCode, selectPlantCode + DateTime.Now.ToString("yyyyMMdd"));
+                // numericUpDown1.Value = Convert.ToInt32(cardIndex.Substring(cardIndex.Length-4, 4));
+                if (dt.Rows.Count > 0)
+                {
+                    numericUpDown1.Value = Convert.ToInt32(dt.Rows[0]["PASTECARDNO"].ToString().Substring(dt.Rows[0]["PASTECARDNO"].ToString().Length - 4, 4));
+                }
+                else
+                {
+                    numericUpDown1.Value = 0;
+                
+                }
+                //    }
+
+            }
+
+
+            //}
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.designer.cs
new file mode 100644
index 0000000..9cb50fd
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.designer.cs
@@ -0,0 +1,133 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJResetSendIndexForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label3 = new System.Windows.Forms.Label();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold);
+            this.label3.Location = new System.Drawing.Point(125, 55);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(93, 20);
+            this.label3.TabIndex = 22;
+            this.label3.Text = "工作中心";
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(221, 53);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(83, 24);
+            this.comboBox1.TabIndex = 21;
+            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+            // 
+            // btnSave
+            // 
+            this.btnSave.Location = new System.Drawing.Point(203, 186);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(75, 23);
+            this.btnSave.TabIndex = 20;
+            this.btnSave.Text = "保存";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // numericUpDown1
+            // 
+            this.numericUpDown1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.numericUpDown1.Location = new System.Drawing.Point(219, 101);
+            this.numericUpDown1.Maximum = new decimal(new int[] {
+            9999,
+            0,
+            0,
+            0});
+            this.numericUpDown1.Name = "numericUpDown1";
+            this.numericUpDown1.Size = new System.Drawing.Size(86, 26);
+            this.numericUpDown1.TabIndex = 19;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold);
+            this.label1.Location = new System.Drawing.Point(50, 102);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(156, 20);
+            this.label1.TabIndex = 18;
+            this.label1.Text = "当前发车数量为";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold);
+            this.label2.Location = new System.Drawing.Point(6, 53);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(119, 20);
+            this.label2.TabIndex = 17;
+            this.label2.Text = "2016-10-29";
+            // 
+            // ResetSendIndexForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(317, 262);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.comboBox1);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.numericUpDown1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.label2);
+            this.Name = "ResetSendIndexForm";
+            this.Text = "贴车单顺序校正";
+            this.Load += new System.EventHandler(this.ResetSendIndexForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.Button btnSave;
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJResetSendIndexForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.cs
new file mode 100644
index 0000000..aa6062d
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using Model;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    public partial class TJfrmLineSetting : Form
+    {
+        /// <summary>
+        /// 工位终端：设置生产线，设置完成的生产线保存在APP.CONFIG中的FlashProCode。
+        /// 创建时间:2013-03-30
+        /// 创 建 人:Sun G.Q.
+        /// </summary>
+        public TJfrmLineSetting()
+        {
+            InitializeComponent();
+            //理想是生产线从数据库表中读取，这里，写死它。
+            IList<EProCodeInfo> proCodes = new List<EProCodeInfo>();
+            //  EProCodeInfo epci = new EProCodeInfo();
+            //epci._Code = "02";
+            // epci._Name = "NF单线";
+
+            // proCodes.Add(epci);
+            // epci = new EProCodeInfo();
+            //epci._Code = "01";
+            //epci._Name = "NF&NCS混线";
+            //proCodes.Add(epci);
+
+            QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+            DataTable tblCodes = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetWORKCENTERCODE.ToString());
+
+            for (var i = 0; i < tblCodes.Rows.Count; i++)
+            {
+                EProCodeInfo epci = new EProCodeInfo();
+                epci._Name = tblCodes.Rows[i][1].ToString();
+                epci._Code = tblCodes.Rows[i][0].ToString();
+                proCodes.Add(epci);
+
+            }
+            cmbProCode.DataSource = proCodes;
+            cmbProCode.DisplayMember = "_Name";
+            cmbProCode.ValueMember = "_Code";
+            //String vv = QM.Config.CustomConfig.GetItem("FlashProCode");
+            //cmbProCode.SelectedValue = QM.Config.CustomConfig.GetItem("PlantNameConfig");
+            
+            //String vv = QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"];
+            cmbProCode.SelectedValue = QMAPP.WinForm.Common.LocalSetting.Settings["PlantNameConfig",""];
+
+            cbPrintEnable.Checked = string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["PrintDisable", "1"], "0");
+            cbPastNoConfirmEnable.Checked = string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["PastNOConfirmEnable", "0"], "1");
+
+            cbAlertConfirmEnable.Checked = string.Equals(QMAPP.WinForm.Common.LocalSetting.Settings["AlertConfirmEnable", "0"], "1");
+
+            txtStorageTimeLimit.Text = QMAPP.WinForm.Common.LocalSetting.Settings["StorageTimeLimit", "24"];
+
+
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+
+            //if (txPwd.Text.Trim() == String.Empty)
+            //{
+            //    MessageBox.Show("请输入密码。");
+            //    return;
+            //}
+            //String pwd = txPwd.Text.Trim();
+
+
+            //if ("#7788d" == pwd)
+            //{
+
+            //        QM.Config.CustomConfig.SetItem("FlashProCode", cmbProCode.SelectedValue.ToString());
+            //        //MessageBox.Show("生产线设置成功，请重新登录系统。");
+            try
+            {
+                TJFrmPlace fplace = (TJFrmPlace)this.Owner;
+                //fplace.WORKCENTER_CODE = cmbProCode.SelectedValue.ToString();
+                //QM.Config.CustomConfig.SetItem("PlantNameConfig", fplace.WORKCENTER_CODE);
+                //QMAPP.WinForm.Common.LocalSetting.Settings["PlantNameConfig"] = fplace.WORKCENTER_CODE;
+
+                QMAPP.WinForm.Common.LocalSetting.Settings["PrintDisable"] = cbPrintEnable.Checked ? "0" : "1";
+                QMAPP.WinForm.Common.LocalSetting.Settings["PastNOConfirmEnable"] = cbPastNoConfirmEnable.Checked ? "1" : "0";
+
+                QMAPP.WinForm.Common.LocalSetting.Settings["AlertConfirmEnable"] = cbAlertConfirmEnable.Checked ? "1" : "0";
+
+                var StorageTimeLimit = 0d;
+                if (double.TryParse(txtStorageTimeLimit.Text.Trim(), out StorageTimeLimit))
+                {
+                    QMAPP.WinForm.Common.LocalSetting.Settings["StorageTimeLimit"] = txtStorageTimeLimit.Text.Trim();
+                }
+                else
+                {
+                    MessageBox.Show("产品下线时间限制未能保存,请输入数字！");
+                    txtStorageTimeLimit.SelectAll();
+                    txtStorageTimeLimit.Focus();
+                    return;
+                }
+
+                        
+                //fplace.pFisType = fplace.WORKCENTER_CODE.Substring(fplace.WORKCENTER_CODE.Length - 2, 2);
+
+                fplace.GetInitData();
+                this.Close();
+                //            //foreach (Form frm in this.MdiChildren)
+                //            //{
+                //            //    frm.Close();
+                //            //}
+                //            //if (this.MdiChildren.Length == 0)
+                //            //{
+                //            //    Application.Restart();
+                //            //}
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            //}
+            //else
+            //{
+            //    MessageBox.Show("密码错误。");
+            //}
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.designer.cs
new file mode 100644
index 0000000..704ee7f
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.designer.cs
@@ -0,0 +1,160 @@
+namespace QMAPP.WinForm.Forms.TianJin
+{
+    partial class TJfrmLineSetting
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.cmbProCode = new System.Windows.Forms.ComboBox();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.cbPrintEnable = new System.Windows.Forms.CheckBox();
+            this.cbPastNoConfirmEnable = new System.Windows.Forms.CheckBox();
+            this.cbAlertConfirmEnable = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtStorageTimeLimit = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(39, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 12);
+            this.label1.TabIndex = 18;
+            this.label1.Text = "请选择工作中心：";
+            this.label1.Visible = false;
+            // 
+            // cmbProCode
+            // 
+            this.cmbProCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbProCode.FormattingEnabled = true;
+            this.cmbProCode.Location = new System.Drawing.Point(172, 7);
+            this.cmbProCode.Name = "cmbProCode";
+            this.cmbProCode.Size = new System.Drawing.Size(99, 20);
+            this.cmbProCode.TabIndex = 17;
+            this.cmbProCode.Visible = false;
+            // 
+            // btnSave
+            // 
+            this.btnSave.Location = new System.Drawing.Point(95, 201);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(75, 23);
+            this.btnSave.TabIndex = 16;
+            this.btnSave.Text = "保存";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // cbPrintEnable
+            // 
+            this.cbPrintEnable.AutoSize = true;
+            this.cbPrintEnable.Location = new System.Drawing.Point(81, 47);
+            this.cbPrintEnable.Name = "cbPrintEnable";
+            this.cbPrintEnable.Size = new System.Drawing.Size(108, 16);
+            this.cbPrintEnable.TabIndex = 19;
+            this.cbPrintEnable.Text = "启用贴车单打印";
+            this.cbPrintEnable.UseVisualStyleBackColor = true;
+            // 
+            // cbPastNoConfirmEnable
+            // 
+            this.cbPastNoConfirmEnable.AutoSize = true;
+            this.cbPastNoConfirmEnable.Location = new System.Drawing.Point(81, 77);
+            this.cbPastNoConfirmEnable.Name = "cbPastNoConfirmEnable";
+            this.cbPastNoConfirmEnable.Size = new System.Drawing.Size(132, 16);
+            this.cbPastNoConfirmEnable.TabIndex = 20;
+            this.cbPastNoConfirmEnable.Text = "启用前车贴车单确认";
+            this.cbPastNoConfirmEnable.UseVisualStyleBackColor = true;
+            // 
+            // cbAlertConfirmEnable
+            // 
+            this.cbAlertConfirmEnable.AutoSize = true;
+            this.cbAlertConfirmEnable.Location = new System.Drawing.Point(81, 107);
+            this.cbAlertConfirmEnable.Name = "cbAlertConfirmEnable";
+            this.cbAlertConfirmEnable.Size = new System.Drawing.Size(120, 16);
+            this.cbAlertConfirmEnable.TabIndex = 21;
+            this.cbAlertConfirmEnable.Text = "启用错误报警确认";
+            this.cbAlertConfirmEnable.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(82, 138);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 12);
+            this.label2.TabIndex = 22;
+            this.label2.Text = "产品下线时间限制";
+            // 
+            // txtStorageTimeLimit
+            // 
+            this.txtStorageTimeLimit.Location = new System.Drawing.Point(81, 155);
+            this.txtStorageTimeLimit.Name = "txtStorageTimeLimit";
+            this.txtStorageTimeLimit.Size = new System.Drawing.Size(46, 21);
+            this.txtStorageTimeLimit.TabIndex = 23;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(133, 158);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(29, 12);
+            this.label3.TabIndex = 24;
+            this.label3.Text = "小时";
+            // 
+            // frmLineSetting
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(283, 236);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.txtStorageTimeLimit);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.cbAlertConfirmEnable);
+            this.Controls.Add(this.cbPastNoConfirmEnable);
+            this.Controls.Add(this.cbPrintEnable);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.cmbProCode);
+            this.Controls.Add(this.btnSave);
+            this.Name = "frmLineSetting";
+            this.Text = "贴车单设置";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cmbProCode;
+        private System.Windows.Forms.Button btnSave;
+        private System.Windows.Forms.CheckBox cbPrintEnable;
+        private System.Windows.Forms.CheckBox cbPastNoConfirmEnable;
+        private System.Windows.Forms.CheckBox cbAlertConfirmEnable;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtStorageTimeLimit;
+        private System.Windows.Forms.Label label3;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJfrmLineSetting.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/LoginForm.Designer.cs b/APPQ5/QMAPP.WinForm/LoginForm.Designer.cs
index ec9e857..c09be71 100644
--- a/APPQ5/QMAPP.WinForm/LoginForm.Designer.cs
+++ b/APPQ5/QMAPP.WinForm/LoginForm.Designer.cs
@@ -117,7 +117,7 @@
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(274, 21);
             this.label3.TabIndex = 1;
-            this.label3.Text = "富维安道拓成都数字化工厂";
+            this.label3.Text = "富维安道拓数字化工厂";
             // 
             // comboBox1
             // 
diff --git a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
index f8ae3a5..cb67a7e 100644
--- a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
+++ b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
@@ -59,6 +59,7 @@
             this.tsmiTakeOut = new System.Windows.Forms.ToolStripMenuItem();
             this.tsiShipment = new System.Windows.Forms.ToolStripMenuItem();
             this.FrmPlace = new System.Windows.Forms.ToolStripMenuItem();
+            this.TJFrmPlace = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiQuery = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiProductInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.andonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -303,7 +304,8 @@
             // tsiShipment
             // 
             this.tsiShipment.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FrmPlace});
+            this.FrmPlace,
+            this.TJFrmPlace});
             this.tsiShipment.Name = "tsiShipment";
             this.tsiShipment.Size = new System.Drawing.Size(94, 28);
             this.tsiShipment.Text = "发货管理";
@@ -315,6 +317,13 @@
             this.FrmPlace.Text = "仪表发运";
             this.FrmPlace.Click += new System.EventHandler(this.FrmPlace_Click);
             // 
+            // TJFrmPlace
+            // 
+            this.TJFrmPlace.Name = "TJFrmPlace";
+            this.TJFrmPlace.Size = new System.Drawing.Size(152, 28);
+            this.TJFrmPlace.Text = "TJ门板发运";
+            this.TJFrmPlace.Click += new System.EventHandler(this.TJFrmPlace_Click);
+            // 
             // tsmiQuery
             // 
             this.tsmiQuery.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -430,7 +439,7 @@
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "富维安道拓成都数字化工厂";
+            this.Text = "富维安道拓数字化工厂";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed);
@@ -461,6 +470,7 @@
         private System.Windows.Forms.ToolStripMenuItem PrintCodeToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem tsiShipment;
         private System.Windows.Forms.ToolStripMenuItem FrmPlace;
+        private System.Windows.Forms.ToolStripMenuItem TJFrmPlace;
         private System.Windows.Forms.ToolStripMenuItem andonToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem AodonToolStripMenuItem;
         private System.Windows.Forms.Timer timer1;
diff --git a/APPQ5/QMAPP.WinForm/MainForm.cs b/APPQ5/QMAPP.WinForm/MainForm.cs
index 6b946a0..fbc7f4b 100644
--- a/APPQ5/QMAPP.WinForm/MainForm.cs
+++ b/APPQ5/QMAPP.WinForm/MainForm.cs
@@ -21,7 +21,7 @@ using QMAPP.WinForm.Forms.ProductIn;
 using System.Configuration;
 using System.ServiceModel.Configuration;
 using QMAPP.WinForm.Forms.RePrint;
-
+using QMAPP.WinForm.Forms.TianJin;
 
 namespace QMAPP.WinForm
 {
@@ -567,6 +567,26 @@ namespace QMAPP.WinForm
             }
         }
 
+        private void TJFrmPlace_Click(object sender, EventArgs e)
+        {
+
+            Form f = Application.OpenForms["TJFrmPlace"];  //查找是否打开过Form1窗体
+            if (f == null)  //没打开过
+            {
+                TJFrmPlace form = new TJFrmPlace();
+                //new KeyEvent().SetKeyToTxt(form);
+                ClientContext.SetUserAuth(form);
+                form.MdiParent = this;
+                form.WindowState = FormWindowState.Maximized;
+                form.Show();   //重新new一个Show出来
+            }
+            else
+            {
+                f.WindowState = FormWindowState.Normal;
+                f.Focus();   //打开过就让其获得焦点
+            }
+        }
+
         private void VedioToolStripMenuItem1_Click(object sender, EventArgs e)
         {
             Form f = Application.OpenForms["MediaPlayerForm"];  //查找是否打开过Form1窗体
diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
index 05333e3..fff6dad 100644
--- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
+++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
@@ -801,6 +801,53 @@
     <Compile Include="Forms\RePrint\ReprintForm.Designer.cs">
       <DependentUpon>ReprintForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\TianJin\TJDefaultDataSetNum.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJDefaultDataSetNum.designer.cs">
+      <DependentUpon>TJDefaultDataSetNum.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmCarCardDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmCarCardDetail.designer.cs">
+      <DependentUpon>TJFrmCarCardDetail.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmCarCardPrintShow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmCarCardPrintShow.designer.cs">
+      <DependentUpon>TJFrmCarCardPrintShow.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmItemList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmItemList.designer.cs">
+      <DependentUpon>TJFrmItemList.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJfrmLineSetting.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJfrmLineSetting.designer.cs">
+      <DependentUpon>TJfrmLineSetting.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmPlace.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJFrmPlace.designer.cs">
+      <DependentUpon>TJFrmPlace.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJPastCard.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJPastCardModel.cs" />
+    <Compile Include="Forms\TianJin\TJPrintPasteCard.cs" />
+    <Compile Include="Forms\TianJin\TJResetSendIndexForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TianJin\TJResetSendIndexForm.designer.cs">
+      <DependentUpon>TJResetSendIndexForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\WarehouseManage\OutWarehouseForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1234,6 +1281,27 @@
     <EmbeddedResource Include="Forms\RePrint\ReprintForm.resx">
       <DependentUpon>ReprintForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJDefaultDataSetNum.resx">
+      <DependentUpon>TJDefaultDataSetNum.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJFrmCarCardDetail.resx">
+      <DependentUpon>TJFrmCarCardDetail.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJFrmCarCardPrintShow.resx">
+      <DependentUpon>TJFrmCarCardPrintShow.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJFrmItemList.resx">
+      <DependentUpon>TJFrmItemList.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJfrmLineSetting.resx">
+      <DependentUpon>TJfrmLineSetting.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJFrmPlace.resx">
+      <DependentUpon>TJFrmPlace.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TianJin\TJResetSendIndexForm.resx">
+      <DependentUpon>TJResetSendIndexForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\WarehouseManage\OutWarehouseForm.resx">
       <DependentUpon>OutWarehouseForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -1330,6 +1398,8 @@
     <Content Include="PrintTemplate\LoginLabel.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Forms\TianJin\RerportModel.ttx" />
+    <None Include="Forms\TianJin\TJPastCard.rpt" />
     <None Include="PrintTemplate\reprint.qdf" />
     <Content Include="PrintTemplate\InjectLabel_NCB.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
index 7ba0b78..32f5b09 100644
--- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
+++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
@@ -1940,6 +1940,69 @@ namespace QMAPP.ServicesAgent
     [Description("发运模块")]
     public enum FrmPlaceManage
     {
+        #region 天津门板发运
+
+        /// <summary>
+        /// 发运模块列表查询--天津门板发运
+        /// </summary>
+        [Description("发运模块列表查询")]
+        TJFrmPlaceBLL_GetList,
+
+        /// <summary>
+        /// 发运模块列表查询--天津门板发运
+        /// </summary>
+        [Description("发运模块挂起")]
+        TJFrmPlaceBLL_UpdateWorkOrderState,
+
+        /// <summary>
+        /// 发运模块列表查询--天津门板发运
+        /// </summary>
+        [Description("通过总成条码获取产品")]
+        TJFrmPlaceBLL_GetProductByAssembleCode,
+        TJFrmPlaceBLL_GetTimeOutSet,
+
+        /// <summary>
+        ///   判断条码是否重复--天津门板发运
+        /// </summary>
+        [Description("  判断条码是否重复")]
+        TJFrmPlaceBLL_ExistBarcode,
+        /// <summary>
+        ///   获取 DASPASTECARDINDEX表数据--天津门板发运
+        /// </summary>
+        [Description("  获取 DASPASTECARDINDEX表数据")]
+        TJFrmPlaceBLL_GetDaspssteCarIndexByPlanName,
+        /// <summary>
+        ///   添加贴车单--天津门板发运
+        /// </summary>
+        [Description("  添加贴车单")]
+        TJFrmPlaceBLL_AddNewPasteCard,
+        /// <summary>
+        ///   插入 DASPASTECARDINDEX表数据--天津门板发运
+        /// </summary>
+        [Description("  插入 DASPASTECARDINDEX表数据")]
+        TJFrmPlaceBLL_InsertDaspssteCarIndexByPlanName,
+        /// <summary>
+        ///    根据贴车单ID获取详细--天津门板发运
+        /// </summary>
+        [Description("   根据贴车单ID获取详细")]
+        TJFrmPlaceBLL_GetPascardDetailsByPid,
+        /// <summary>
+        /// 贴车单记录查询
+        /// </summary>
+        [Description("贴车单记录查询")]
+        TJFrmPlaceBLL_GetPastecardInfoWithVin,
+        /// <summary>
+        ///   GetPastecardDeatis
+        /// </summary>
+        [Description("  GetPastecardDeatis")]
+        TJFrmPlaceBLL_GetPastecardDeatis,
+        /// <summary>
+        ///   获取工作中心
+        /// </summary>
+        [Description("  获取工作中心")]
+        TJFrmPlaceBLL_GetWORKCENTERCODE,
+
+        #endregion
         /// <summary>
         /// 发运模块列表查询
         /// </summary>
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml
index 67522c0..d3b3a3c 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml
@@ -945,4 +945,19 @@
     <AssemblyFile>QMAPP.FJC.BLL.DLL</AssemblyFile>
   </ServiceDefinition>
 
+
+  <ServiceDefinition>
+    <ServiceName>TJDoorPlankPlanBLL</ServiceName>
+    <ServiceDes>天津门板发运计划</ServiceDes>
+    <FullLogicClassName>QMAPP.FJC.BLL.TianJin.TJDoorPlankPlanBLL</FullLogicClassName>
+    <AssemblyFile>QMAPP.FJC.BLL.DLL</AssemblyFile>
+  </ServiceDefinition>
+
+  <ServiceDefinition>
+    <ServiceName>TJFrmPlaceBLL</ServiceName>
+    <ServiceDes>天津门板发运模块</ServiceDes>
+    <FullLogicClassName>QMAPP.FJC.BLL.TianJin.TJFrmPlaceBLL</FullLogicClassName>
+    <AssemblyFile>QMAPP.FJC.BLL.DLL</AssemblyFile>
+  </ServiceDefinition>
+
 </BusinessDllList>
\ No newline at end of file
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index a4f328a..e3c5ed6 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -66,13 +66,14 @@
 
     <!--<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.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;max pool size=10240;" 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"/>-->
 
+    <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="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
     <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=10.114.50.240;Initial Catalog=ADIENT_QD_MES;Persist Security Info=True;User ID=qdmes;Password=Password1;" providerName="System.Data.SqlClient"/>
     <add name="maindbMB" connectionString="Data Source=10.123.4.20;Initial Catalog=QdFisMB;Persist Security Info=True;User ID=sa;Password=qm;" providerName="System.Data.SqlClient"/>