.

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs

@@ -45,7 +45,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
             //                     case  when IsRetransmission=0 then '是' when IsRetransmission=1 then '否' when IsRetransmission is null then '否' end as  IsRetransmission,
             //(CASE WHEN p.End_Date IS NULL THEN GETDATE() ELSE p.End_Date END)  End_Date
             //                    from xl_plan p left join  xl_recipe r on p.Recipe_ID=r.ID Left Join Pmt_ShifTime B On(p.Shift_Id = B.Shift_ID)) t    WHERE 1=1");
-            sb.AppendLine(@" select * from (select p.Plan_Id,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_StateText,p.Plan_Num,p.Real_Num,p.Start_Date,p.Weight_Man,r.Total_Weight,Plan_TotalWeight,Total_Error,Plan_TotalError,
+            sb.AppendLine(@" select * from (select p.Batch,p.ProductName, p.Plan_Id,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_StateText,p.Plan_Num,p.Real_Num,p.Start_Date,p.Weight_Man,r.Total_Weight,Plan_TotalWeight,Total_Error,Plan_TotalError,
                              case  when IsRetransmission=0 then '是' when IsRetransmission=1 then '否' when IsRetransmission is null then '否' end as  IsRetransmission,
 							 (CASE WHEN p.End_Date IS NULL THEN GETDATE() ELSE p.End_Date END)  End_Date
                             from xl_plan p left join  xl_recipe r on p.Recipe_ID=r.ID) t    WHERE 1=1");

Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml

@@ -108,7 +108,7 @@
           <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
             <Property name="DisplayAllColumn">False</Property>
             <Property name="DgvColumn">
-              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADQAAAEUBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAA0DBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGEQAAAAdwbGFuX0lkBhIAAAAJ6K6h5YiS5Y+3AQUAAAAEAAAABhMAAAALUmVjaXBlX05hbWUGFAAAAAzphY3mlrnlkI3np7ABBgAAAAQAAAAGFQAAAAdWZXJzaW9uBhYAAAAM6YWN5pa554mI5pysAQcAAAAEAAAABhcAAAAOUGxhbl9TdGF0ZVRleHQGGAAAAAzorqHliJLnirbmgIEBCAAAAAQAAAAGGQAAAAhQbGFuX051bQYaAAAADOiuoeWIkuaJueasoQEJAAAABAAAAAYbAAAACFJlYWxfTnVtBhwAAAAM5omn6KGM5om55qyhAQoAAAAEAAAABh0AAAAKU3RhcnRfRGF0ZQYeAAAADOW8gOWni+aXtumXtAELAAAABAAAAAYfAAAADFRvdGFsX1dlaWdodAYgAAAADOiuoeWIkumHjemHjwEMAAAABAAAAAYhAAAAEFBsYW5fVG90YWxXZWlnaHQGIgAAAAzlrp7pmYXph43ph48BDQAAAAQAAAAGIwAAAAtUb3RhbF9FcnJvcgYkAAAADOiuoeWIkuivr+W3rgEOAAAABAAAAAYlAAAAD1BsYW5fVG90YWxFcnJvcgYmAAAADOWunumZheivr+W3rgEPAAAABAAAAAYnAAAACldlaWdodF9NYW4GKAAAAAnmiafooYzkuroBEAAAAAQAAAAGKQAAAAhFbmRfRGF0ZQYqAAAADOe7k+adn+aXtumXtAs=</Binary>
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADwAAAIMBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAAkRAAAACRIAAAAKBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGEwAAAAVCYXRjaAYUAAAADOaJp+ihjOaJueasoQEFAAAABAAAAAYVAAAAC1Byb2R1Y3ROYW1lBhYAAAAM5Lqn5ZOB5ZCN56ewAQYAAAAEAAAABhcAAAAHcGxhbl9JZAYYAAAACeiuoeWIkuWPtwEHAAAABAAAAAYZAAAAC1JlY2lwZV9OYW1lBhoAAAAM6YWN5pa55ZCN56ewAQgAAAAEAAAABhsAAAAHVmVyc2lvbgYcAAAADOmFjeaWueeJiOacrAEJAAAABAAAAAYdAAAADlBsYW5fU3RhdGVUZXh0Bh4AAAAM6K6h5YiS54q25oCBAQoAAAAEAAAABh8AAAAIUGxhbl9OdW0GIAAAAAzorqHliJLmibnmrKEBCwAAAAQAAAAGIQAAAAhSZWFsX051bQYiAAAADOaJp+ihjOaJueasoQEMAAAABAAAAAYjAAAAClN0YXJ0X0RhdGUGJAAAAAzlvIDlp4vml7bpl7QBDQAAAAQAAAAGJQAAAAxUb3RhbF9XZWlnaHQGJgAAAAzorqHliJLph43ph48BDgAAAAQAAAAGJwAAABBQbGFuX1RvdGFsV2VpZ2h0BigAAAAM5a6e6ZmF6YeN6YePAQ8AAAAEAAAABikAAAALVG90YWxfRXJyb3IGKgAAAAzorqHliJLor6/lt64BEAAAAAQAAAAGKwAAAA9QbGFuX1RvdGFsRXJyb3IGLAAAAAzlrp7pmYXor6/lt64BEQAAAAQAAAAGLQAAAApXZWlnaHRfTWFuBi4AAAAJ5omn6KGM5Lq6ARIAAAAEAAAABi8AAAAIRW5kX0RhdGUGMAAAAAznu5PmnZ/ml7bpl7QL</Binary>
             </Property>
             <Property name="ClickActionList">
               <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>