11

APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs

@@ -155,8 +155,8 @@ namespace QMAPP.FJC.BLL.TianJin
                 storageLog.InStorageType = info.InStorageType;
                 //storageLog
 
-                //StorageLogDAL cmdDALlog = new StorageLogDAL();
+                StorageLogDAL cmdDALlog = new StorageLogDAL();
-                //cmdDALlog.Insert(storageLog);
+                cmdDALlog.Insert(storageLog);
 
 
                 result.IsSuccess = true;
@@ -194,6 +194,7 @@ namespace QMAPP.FJC.BLL.TianJin
                 info.State = "2";
                 info.UPDATEDATE = DateTime.Now.ToString();
                 info.UPDATEUSER = this.LoginUser.UserName;
+                info.OutStorageType = model.OutStorageType;
                 int temp = new StorageDAL().Update(info);
 
                 var storageLog = new StorageLog();
@@ -208,6 +209,9 @@ namespace QMAPP.FJC.BLL.TianJin
                 storageLog.MATERIALNAME = info.MATERIALNAME;
                 storageLog.InStorageType = info.InStorageType;
 
+                StorageLogDAL cmdDALlog = new StorageLogDAL();
+                cmdDALlog.Insert(storageLog);
+
                 if (temp == 0)
                 {
                     result.IsSuccess = false;

APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs

@@ -177,6 +177,11 @@ namespace QMAPP.FJC.DAL.FIS
                     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.PLAN_STATE) == false)
+                {
+                    whereBuilder.Append(" AND O.PLAN_STATE = @PLAN_STATE ");
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_STATE", DataType = DbType.String, Value = condition.PLAN_STATE });
+                }
                 //物料号
                 if (string.IsNullOrEmpty(condition.MATERIAL_CODE) == false)
                 {

APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs

@@ -131,6 +131,12 @@ namespace QMAPP.FJC.DAL.TianJin
                     whereBuilder.Append(" AND MATERIAL_CODE = @MATERIAL_CODE ");
                     parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE });
                 }
+                //状态
+                if (string.IsNullOrEmpty(condition.PLAN_STATE) == false)
+                {
+                    whereBuilder.Append(" AND PLAN_STATE = @PLAN_STATE ");
+                    parameters.Add(new DataParameter { ParameterName = "PLAN_STATE", DataType = DbType.String, Value = condition.PLAN_STATE });
+                }
 
                 //计划时间
                 if (condition.PLANTIMESTART != DateTime.MinValue)

APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml

@@ -455,6 +455,10 @@
       <items key="2" value="完成" />
     </Dictionary>
 
+    <Dictionary Name="TJ_PLAN_STATE">
+      <items key="0" value="初始" />
+      <items key="1" value="发布" />
+    </Dictionary>
 
     <Dictionary Name="CALL_STATE">
       <items key="0" value="正在呼叫" />

APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs

@@ -72,6 +72,7 @@ namespace QMAPP.FJC.Web.Controllers
                 //获取前台分页设置信息
                 page = this.GetDataPage(seachModel);
                 condition = CopyToModel<Storage, StorageModel>(seachModel);
+                condition.State = "1";
                 #region wcf服务统一接口
 
                 pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("StorageBLL_GetList", condition, page);

APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanController.cs

@@ -38,6 +38,7 @@ namespace QMAPP.FJC.Web.Controllers
             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.PLAN_STATE = "0";
             seachModel.ImmediateSearch = false;
             if (callback == true)
                 TryGetSelectBuffer<TJDoorPlankPlanModel>(out seachModel);

APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs

@@ -40,6 +40,7 @@ namespace QMAPP.FJC.Web.Controllers
             seachModel.ORDER_TYPE = order_type;
             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.PLAN_STATE = "0";
             seachModel.ImmediateSearch = false;
             if (callback == true)
                 TryGetSelectBuffer<DoorPlankPlanModel>(out seachModel);

APPQ5/QMAPP.FJC.Web/Models/FIS/DoorPlankPlanModel.cs

@@ -43,7 +43,8 @@ namespace QMAPP.FJC.Web.Models.FIS
         ///计划状态
         ///</summary>
         [Description("计划状态")]
-        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30, Width = 180, JsonUtl = "/Dict/GetFixedComboxSource?kind=PLAN_STATE")]
+        //[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; }

APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageLogModel.cs

@@ -29,7 +29,7 @@ namespace QMAPP.FJC.Web.Models.TianJin
         [Description("产品编码")]
         [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
         [InputType(inputType.text)]
-        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+        [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
         public string ProductCode { get; set; }
 
 

APPQ5/QMAPP.FJC.Web/Models/TianJin/StorageModel.cs

@@ -29,7 +29,7 @@ namespace QMAPP.FJC.Web.Models.TianJin
         [Description("产品编码")]
         [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
         [InputType(inputType.text)]
-        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+        [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
         public string ProductCode { get; set; }
 
         /// <summary>

APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs

@@ -50,7 +50,8 @@ namespace QMAPP.FJC.Web.Models.TianJin
         ///计划状态
         ///</summary>
         [Description("计划状态")]
-        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
+        [HTMLInput(UpdateRead = false, required = true, MaxLength = 30, Width = 180, JsonUtl = "/Dict/GetFixedComboxSource?kind=PLAN_STATE")]
+        //[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; }

APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlan/DoorPlankPlanList.aspx

@@ -15,6 +15,13 @@
             <td>
                 <%=Html.QC(p => p.PLAN_NO)%> 
             </td>
+            <th align="right">
+                <%=Html.QV(p => p.PLAN_STATE)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.PLAN_STATE)%> 
+            </td>
+            
             <th align="right">
                 <%=Html.QV(p => p.MATERIAL_CODE)%>
             </th>

APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx

@@ -36,12 +36,17 @@
         </tr>
         <tr>
              <th align="right">
+                <%=Html.QV(p => p.PLAN_STATE)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.PLAN_STATE)%>
+            </td>
+            <th align="right">
                 <%=Html.QV(p => p.PLANSOURCE)%>
             </th>
             <td>
                 <%=Html.QC(p => p.PLANSOURCE)%>
             </td>
-            
             <th align="right">
                 <%=Html.QV(p => p.PLANTIMESTART)%>
             </th>

APPQ5/QMAPP.WinForm/App.config

@@ -8,10 +8,10 @@
     <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
 
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
 
-    <!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
 
 
   </connectionStrings>
@@ -184,13 +184,13 @@
     </bindings>
     <client>
       
-      <!--<endpoint address="http://123.56.115.74:8989/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
+      <endpoint address="http://123.56.115.74:8989/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
       <endpoint address="http://123.56.115.74:8989/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
-      <endpoint address="net.tcp://10.111.144.99:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
+      <endpoint address="net.tcp://10.111.144.99:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
       
-      <endpoint address="net.tcp://localhost:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
+      <!--<endpoint address="net.tcp://localhost:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
       <endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
-      <endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
+      <endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
     
     </client>
   </system.serviceModel>

APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@@ -17,6 +17,7 @@ using QMAPP.MD.Entity;
 using QMAPP.FJC.Entity.Basic;
 using QMAPP.FJC.Entity.TianJin;
 using QMAPP.ServicesAgent;
+using QMAPP.MD.Entity.TianJin;
 
 namespace QMAPP.WinForm.Forms.TianJin
 {
@@ -503,8 +504,8 @@ namespace QMAPP.WinForm.Forms.TianJin
                     }
                     QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
                     agent.InvokeServiceFunction<int>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_UpdateWorkOrderState.ToString(), ids);
-                    
+                    GetInitData();
-                //_agent.InvokeServiceFunction<int>(B9IPCService.WorkOrderBLL_CancelSuspend.ToString(), ids);
+                    //_agent.InvokeServiceFunction<int>(B9IPCService.WorkOrderBLL_CancelSuspend.ToString(), ids);
 
                     //if (dgvMATChange.Rows.Count > 0)
                     //{
@@ -2028,14 +2029,44 @@ namespace QMAPP.WinForm.Forms.TianJin
                 doc.PrinterSettings.PrinterName = _TJFYPrintName;
 
                 prin.Print(dt, _TJFYPrintName);
-                lberror.Text = "贴车单已打印";
+                lberror.Text = "贴车单已打印;";
             }
             else
             {
                 prin.Print(dt);
-                lberror.Text = "贴车单已打印";
+                lberror.Text = "贴车单已打印;";
             }
 
+            #region 针对贴车单上的条码进行出库操作
+
+            for (var i = 0; i < tbl.Rows.Count; i++)
+            {
+                var count = agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_SelectCount", tbl.Rows[i]["VIN"].ToString());
+
+                //如果条码未入库，先进行入库操作
+                if (count.Result <= 0)
+                {
+                    Storage pi = new Storage();
+                    pi.ProductCode = tbl.Rows[i]["VIN"].ToString();
+                    pi.InStorageType = "发运入库";
+
+                     agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_Insert", pi);
+                }
+
+                var storage = new Storage();
+                storage.ProductCode = tbl.Rows[i]["VIN"].ToString();
+                storage.OutStorageType = "发运出库";
+                var result = agent.InvokeServiceFunction<DataResult>("StorageBLL_Update", storage);
+                if (!result.IsSuccess)
+                {
+                    lberror.Text += tbl.Rows[i]["VIN"].ToString() + "出库失败;原因:" + result.Msg; ;
+                }
+            }
+            
+
+            #endregion
+
+
         }
         #endregion 
 

APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs

@@ -247,8 +247,6 @@
             // 
             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;
@@ -274,7 +272,7 @@
             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.MultiSelect = true;
             this.dgvMATChange.Name = "dgvMATChange";
             this.dgvMATChange.ReadOnly = true;
             this.dgvMATChange.RowHeadersWidth = 40;

APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs

@@ -72,6 +72,7 @@
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit();
             this.tpContent.SuspendLayout();
             this.tpPlanList.SuspendLayout();
@@ -267,6 +268,7 @@
             this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton1,
             this.tsbPrint,
             this.tsbOrderOperation,
             this.tslblOrderCount});
@@ -309,7 +311,7 @@
             this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop;
             this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiSuspendOrder.Name = "tsmiSuspendOrder";
-            this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26);
+            this.tsmiSuspendOrder.Size = new System.Drawing.Size(184, 26);
             this.tsmiSuspendOrder.Text = "挂起工单";
             this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click);
@@ -319,7 +321,7 @@
             this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back;
             this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiCancelSuspend.Name = "tsmiCancelSuspend";
-            this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26);
+            this.tsmiCancelSuspend.Size = new System.Drawing.Size(184, 26);
             this.tsmiCancelSuspend.Text = "取消挂起";
             this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click);
             // 
@@ -328,7 +330,7 @@
             this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete;
             this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiDeleteOrder.Name = "tsmiDeleteOrder";
-            this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26);
+            this.tsmiDeleteOrder.Size = new System.Drawing.Size(184, 26);
             this.tsmiDeleteOrder.Text = "删除工单";
             this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click);
             // 
@@ -470,6 +472,18 @@
             this.label2.TabIndex = 18;
             this.label2.Text = "门板位置";
             // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(146, 67);
+            this.toolStripButton1.Text = "批量打印(&P)";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+            // 
             // TJPrintPlanLabel
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F);
@@ -536,5 +550,6 @@
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
     }
 }

APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

@@ -502,6 +502,72 @@ namespace QMAPP.WinForm.Forms.TianJin
             SaveSetting();
             BindPlanView();
         }
+        /// <summary>
+        /// 批量打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void toolStripButton1_Click(object sender, EventArgs e)
+        {
+            var count = 0;
+            
+            if (dgvPlan.Rows.Count == 0)
+            {
+                MessageBox.Show("当前生产线没有未打印标签的计划工单！");
+            }
+            if (int.Parse(cbListRowcount.Text) <= dgvPlan.Rows.Count)
+                count = int.Parse(cbListRowcount.Text);
+            else
+                count = dgvPlan.Rows.Count;
+            
+            for (var i = 0; i < count; i++)
+            {
+                var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>();
+
+                var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i].DataBoundItem;
+                orders.Add(order1);
+
+                toolStripButton1.Enabled = false;
+                    
+                List<LabelData> labels = new List<LabelData>();
+
+                var data = DateTime.Now.ToString("yyyyMMddHHmmssfff");
+                data = data.Substring(2, data.Length - 2);
+                    
+                string positioncode = GetNameCode(orders[0].MATERIAL_NAME);
+                var book = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode);
+
+                LabelData labeldata = new LabelData();
+
+                labeldata.MATERIALCODE = orders[0].MATERIAL_CODE;
+
+
+                labeldata.PlanDate = orders[0].PLAN_DATE;
+                if (book != null)
+                {
+                    labeldata.Class = " " + book.Class.Substring(0, 2);
+                    labeldata.Description = book.Text;
+                    labeldata.OrderNo = book.CarModel + positioncode + data;
+                }
+                var mcresult = _agent.InvokeServiceFunction<DataResult<Material>>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE });
+                var material = mcresult.IsSuccess ? mcresult.Result : null;
+                if (material != null)
+                {
+                    labeldata.MaterialName = material.MATERIAL_SHORT;
+                    labeldata.CarModel = material.PROJECTCODE;
+                }
+                labels.Add(labeldata);
+
+                PrintLabel(labels);
+
+                //变更打印状态 0=>1
+                _agent.InvokeServiceFunction<int>("WorkOrderBLL_SetOrderPrinted", orders[0].PID);
+                
+            }
+
+            BindPlanView();
+            toolStripButton1.Enabled = true;
+        }
     }
     class Direction {
         public string Code { get; set; }

APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx

@@ -154,6 +154,76 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        Ae6xxmll7eSUAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="tsbPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.03.29.01")]
+[assembly: AssemblyVersion("2022.03.31.01")]
-[assembly: AssemblyFileVersion("2022.03.29.01")]
+[assembly: AssemblyFileVersion("2022.03.31.01")]

ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@@ -64,13 +64,9 @@
     <!--主数据库连接-->
 
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
-
-
-
-    <!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
 
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>-->