合并代码提交

Controller/SCP_EXCEL_CONTROLLER.cs

@@ -71,6 +71,34 @@ namespace CK.SCP.Controller
             }
             return _ds;
         }
+        public static DataSet GET_OTD_VendId_REPORT_EXECEL(List<SCP_OTD_EXPORT> p_lst)
+        {
+            DataSet _ds = new DataSet();
+            var _exportList = new List<SCP_OTD_VendId_REPORT_EXPORT>();
+            using (ScpEntities db = EntitiesFactory.CreateScpInstance())
+            {
+                p_lst.ForEach(itm =>
+                {
+                    SCP_OTD_VendId_REPORT_EXPORT _entity = new SCP_OTD_VendId_REPORT_EXPORT();
+                    _entity.要货看板号 = itm.AskBillNum;
+                    _entity.供应商编号 = itm.VendId;
+                    _entity.供应商名称 = itm.VendName;
+                    _entity.要求到货时间 = Convert.ToDateTime(itm.EndTime).ToString("yyyy/MM/dd");
+                    _entity.订单要货数量 = itm.AskQty.ToString();
+                    _entity.到货数量 = itm.ArriveQty.ToString();
+                    _entity.差额 = itm.Qty.ToString();
+                    _entity.及时数量 = itm.NntimelyQty.ToString();
+                    _entity.及时率 = itm.OTD.ToString();
+                    _entity.到货率 = itm.ArriveOTD.ToString();
+                    _exportList.Add(_entity);
+                });
+                var _dt = ConvertHelper.ToDataTable(_exportList);
+                _ds.Tables.Add(_dt);
+
+            }
+            return _ds;
+
+        }
 
         public static List<SCP_PO_DETAIL_EXPORT_MODEL> GET_PO_EXECEL_Model(List<string> p_lst, bool p_IsDetail = false)
         {
@@ -113,9 +141,6 @@ namespace CK.SCP.Controller
                     po_detail.收货口 = itm.DockCode;
                     po_detail.项目编号 = itm.ProjectId;
                     po_detail.备注 = string.Empty;
-                    po_detail.预测一 = "0";
-                    po_detail.预测二 = "0";
-                    po_detail.预测三 = "0";
                     _exportDetailList.Add(po_detail);
                    
                 });

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx

@@ -22,7 +22,7 @@
                         <f:Toolbar ID="Toolbar2" runat="server">
                             <Items>
                                 <f:ToolbarSeparator runat="server" />
-                                <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
+                                <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();">
                                 </f:Button>
 
                               

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs

@@ -49,7 +49,7 @@ namespace SCP.WarehouseData
         public void BindData()
         {
             var _entity = new V_TB_RECEIVE();
-            _entity.RecvBillNum=txtReceiveBill.Text;//单据号
+            _entity.RecvBillNum = txtReceiveBill.Text;//单据号
             _entity.ErpRecvBillNum = txtErpBill.Text;//ERP单据号
             if (!string.IsNullOrEmpty(ddl.SelectedValue))
             {
@@ -103,9 +103,9 @@ namespace SCP.WarehouseData
             {
                 if (ret.State == ReturnStatus.Succeed)
                 {
-                    Grid_V_TB_RECEIVE.RecordCount =ret.Result.Count();
+                    Grid_V_TB_RECEIVE.RecordCount = ret.Result.Count();
-                    var _list= SortAndPage(ret.Result, Grid_V_TB_RECEIVE);              
+                    var _list = SortAndPage(ret.Result, Grid_V_TB_RECEIVE);
-                    Grid_V_TB_RECEIVE.DataSource =_list;
+                    Grid_V_TB_RECEIVE.DataSource = _list;
                     Grid_V_TB_RECEIVE.DataBind();
                 }
             });
@@ -202,7 +202,7 @@ namespace SCP.WarehouseData
                 if (selections.Contains(i))
                 {
                     object[] rowDataKeys = Grid_V_TB_RECEIVE.DataKeys[i];
-                   _ls.Add(rowDataKeys[1] as string);
+                    _ls.Add(rowDataKeys[1] as string);
                 }
             }
             var ret = SCP_RECIVECE_CONTROLLER.Save_TB_RECEIVE_STATE(_ls, ReceiveState.Check, strUserName, CurrentUser.UsedDomain);
@@ -265,22 +265,22 @@ namespace SCP.WarehouseData
 
         protected void Grid_V_TB_RECEIVE_RowDataBound(object sender, GridRowEventArgs e)
         {
-           //object[] rowDataKeys = Grid_V_TB_RECEIVE.DataKeys[e.RowIndex];
+            //object[] rowDataKeys = Grid_V_TB_RECEIVE.DataKeys[e.RowIndex];
-           //string _recNum = rowDataKeys[2].ToString();
+            //string _recNum = rowDataKeys[2].ToString();
-           // StringBuilder _buffer = new StringBuilder();
+            // StringBuilder _buffer = new StringBuilder();
-           // System.Web.UI.WebControls.Label _content = (System.Web.UI.WebControls.Label)Grid_V_TB_RECEIVE.Rows[e.RowIndex].FindControl("RowGrid1");
+            // System.Web.UI.WebControls.Label _content = (System.Web.UI.WebControls.Label)Grid_V_TB_RECEIVE.Rows[e.RowIndex].FindControl("RowGrid1");
-           // if (_content != null)
+            // if (_content != null)
-           // {
+            // {
-           //     _buffer.Append("<table><tr><td>订单行</td><td>零件号</td><td>零件名称</td><td>数量</td><td>单位</td></tr>");
+            //     _buffer.Append("<table><tr><td>订单行</td><td>零件号</td><td>零件名称</td><td>数量</td><td>单位</td></tr>");
-           //     var _list = JsonConvert.DeserializeObject<List<V_TB_RECEIVE_DETAIL>>(_recNum);
+            //     var _list = JsonConvert.DeserializeObject<List<V_TB_RECEIVE_DETAIL>>(_recNum);
-           //     _list.ForEach(p =>
+            //     _list.ForEach(p =>
-           //     {
+            //     {
-           //         _buffer.AppendFormat("<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td></tr>"
+            //         _buffer.AppendFormat("<tr><td>{0}</td><td>{1}</td><td>{2}</td><td>{3}</td><td>{4}</td></tr>"
-           //                         , p.PoLine, p.PartCode, p.PartDesc1, p.Qty, p.PoUnit);
+            //                         , p.PoLine, p.PartCode, p.PartDesc1, p.Qty, p.PoUnit);
-           //     });
+            //     });
-           //     _buffer.Append("</talbe>");
+            //     _buffer.Append("</talbe>");
-           //     _content.Text = _buffer.ToString();
+            //     _content.Text = _buffer.ToString();
-           // }
+            // }
         }
     }
 }

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace SCP.WarehouseData {
+namespace SCP.WarehouseData
+{
 
 
-    public partial class SCP_RECEIVE_VIEW {
+    public partial class SCP_RECEIVE_VIEW
+    {
 
         /// <summary>
         /// form1 控件。
@@ -103,22 +105,31 @@ namespace SCP.WarehouseData {
         protected global::FineUI.DropDownList ddl;
 
         /// <summary>
-        /// txtReceiveBill 控件。
+        /// txtSupplier 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox txtReceiveBill;
+        protected global::FineUI.TextBox txtSupplier;
 
         /// <summary>
-        /// txtSupplier 控件。
+        /// txtErpBill 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox txtSupplier;
+        protected global::FineUI.TextBox txtErpBill;
+
+        /// <summary>
+        /// txtReceiveBill 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox txtReceiveBill;
 
         /// <summary>
         /// txtPO 控件。
@@ -138,6 +149,24 @@ namespace SCP.WarehouseData {
         /// </remarks>
         protected global::FineUI.TextBox AsnBillNum;
 
+        /// <summary>
+        /// txtShipTimeStar 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker txtShipTimeStar;
+
+        /// <summary>
+        /// txtShipTimeEnd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker txtShipTimeEnd;
+
         /// <summary>
         /// OperName 控件。
         /// </summary>