343提交

.gitignore

@@ -265,3 +265,4 @@ __pycache__/
 /SCP/exportfiles/收货审核明细-20180530142542391.xls
 /SCP/exportfiles
 /SCP/grf
+/SCP/uploadfiles

Controller/SCP_EXCEL_CONTROLLER.cs

@@ -337,7 +337,7 @@ namespace CK.SCP.Controller
                     _entity.单价 = itm.Price.ToString();
                     _entity.采购价 = itm.PurCost==null?"0":itm.PurCost.Value.ToString();
                     _entity.成本价= itm.StdCost == null ? "0" : itm.StdCost.Value.ToString();
-                    // _entity.要货日期 = itm.BeginTime == null ? string.Empty : itm.BeginTime.Value.ToString("yyyyMMdd");
+                     _entity.收货日期 = itm.UpdateTime == null ? string.Empty : itm.UpdateTime.Value.ToString("yyyyMMdd");
 
                     //_entity.折扣价格 = itm.DiscountPrice.ToString();
                     //_entity.折扣备注 = itm.DiscountRemark;

Controller/SCP_REPORT_CONTROLLER.cs

@@ -1796,5 +1796,99 @@ namespace CK.SCP.Controller
             _buffer.Append(" GROUP BY Site, ProjectId, RecTime, flag");            
             return _buffer.ToString();
         }
+        public static void Get_V_ARRIVE_PO_REPORT(V_ARRIVE_PO_REPORT p_entity, Action<ResultObject<IQueryable<V_ARRIVE_PO_REPORT>>> p_action)
+        {
+            ResultObject<IQueryable<V_ARRIVE_PO_REPORT>> _ret = new ResultObject<IQueryable<V_ARRIVE_PO_REPORT>>();
+            try
+            {
+                using (ScpEntities db = EntitiesFactory.CreateScpInstance())
+                {
+                    IQueryable<V_ARRIVE_PO_REPORT> q = db.V_ARRIVE_PO_REPORT;
+                    if (!string.IsNullOrEmpty(p_entity.PoBillNum))
+                    {
+                        q = q.Where(p => p.PoBillNum.Contains(p_entity.PoBillNum));
+                    }
+                    if (!string.IsNullOrEmpty(p_entity.PartCode))
+                    {
+                        q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
+                    }
+                    if (!string.IsNullOrEmpty(p_entity.PartDesc1))
+                    {
+                        q = q.Where(p => p.PartDesc1.Contains(p_entity.PartDesc1));
+                    }
+                    if (!string.IsNullOrEmpty(p_entity.PartDesc1))
+                    {
+                        q = q.Where(p => p.PartDesc1.Contains(p_entity.PartDesc1));
+                    }
+                    if (!string.IsNullOrEmpty(p_entity.VendName))
+                    {
+                        q = q.Where(p => p.VendName.Contains(p_entity.VendName));
+                    }
+                    if (p_entity.BeginTime != null)
+                    {
+                        q = q.Where(p => p.BeginTime >= p_entity.BeginTime);
+                    }
+                    if (p_entity.BeginTimeEnd != null)
+                    {
+                        q = q.Where(p => p.BeginTime <= p_entity.BeginTimeEnd);
+                    }
+                    if (p_entity.ShipTime != null)
+                    {
+                        q = q.Where(p => p.ShipTime >= p_entity.ShipTime);
+                    }
+                    if (p_entity.ShipTimeEnd != null)
+                    {
+                        q = q.Where(p => p.ShipTime <= p_entity.ShipTimeEnd);
+                    }
+                    _ret.State = ReturnStatus.Succeed;
+                    _ret.Result = q;
+                    p_action(_ret);
+                }
+            }
+            catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常
+            {
+                var sb = new StringBuilder();
+                foreach (var error in dbEx.EntityValidationErrors.ToList())
+                {
+                    error.ValidationErrors.ToList().ForEach(i =>
+                    {
+                        sb.AppendFormat("表：{0}，字段：{1}，信息：{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage);
+                    });
+                }
+                _ret.State = ReturnStatus.Failed;
+                _ret.ErrorList.Add(dbEx);
+                LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_REPORT_CONTROLLER), "Get_V_ARRIVE_PO_REPORT", sb.ToString());
+                throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString());
+            }
+            catch (OptimisticConcurrencyException ex)//并发冲突异常
+            {
+                _ret.State = ReturnStatus.Failed;
+                _ret.ErrorList.Add(ex);
+                LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_REPORT_CONTROLLER), "Get_V_ARRIVE_PO_REPORT", ex.ToString());
+                throw new ScpException(ResultCode.Exception, "9999", ex.ToString());
+            }
+            catch (ScpException ex)
+            {
+                _ret.State = ReturnStatus.Failed;
+                _ret.ErrorList.Add(ex);
+                LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_REPORT_CONTROLLER), "Get_V_ARRIVE_PO_REPORT", ex.ToString());
+                if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException))
+                {
+                    var inner = (UpdateException)ex.InnerException;
+                    throw new ScpException(ResultCode.Exception, "0000", ex.ToString());
+                }
+                else
+                {
+                    if (ex.InnerException != null) throw ex.InnerException;
+                }
+            }
+            catch (Exception e)
+            {
+                _ret.State = ReturnStatus.Failed;
+                _ret.ErrorList.Add(e);
+                LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_REPORT_CONTROLLER), "Get_V_ARRIVE_PO_REPORT", e.Message);
+                throw e;
+            }
+        }
     }
 }

Models/CK.SCP.Models.csproj

@@ -379,6 +379,7 @@
     <Compile Include="ScpEntity\TS_BARCODE_RULE_CUSTOM.cs" />
     <Compile Include="ScpEntity\TS_BARCODE_RULE_SMALL.cs" />
     <Compile Include="ScpEntity\TS_BARCODE_SMALL.cs" />
+    <Compile Include="ScpEntity\V_ARRIVE_PO_REPORT.cs" />
     <Compile Include="ScpEntity\V_ARRIVE_PRINT.cs" />
     <Compile Include="ScpEntity\V_FORECAST_REPORT.cs" />
     <Compile Include="ScpEntity\V_Pie_Chart.cs" />

Models/ScpCache.cs

@@ -315,5 +315,6 @@ namespace CK.SCP.Models
         public string 二维码格式 { get; set; } = "1";
         public string 条码序列号格式 { get; set; } = "000000";
         public string 小包装条码序列号格式 { get; set; } = "600000";
+        public bool 负数发票 { get; set; } = false;
     }
 }

Models/ScpEntities.cs

@@ -106,6 +106,7 @@ namespace CK.SCP.Models
        
         public virtual DbSet<V_TA_VENDER> V_TA_VENDER { get; set; }
         public virtual DbSet<V_TB_INCOMPLETE_ASK> V_TB_INCOMPLETE_ASK { get; set; }
+        public virtual DbSet<V_ARRIVE_PO_REPORT> V_ARRIVE_PO_REPORT { get; set; }       
         public virtual DbSet<V_TB_PALLET_DETAIL> V_TB_PALLET_DETAIL { get; set; }
         public virtual DbSet<V_TB_PALLET> V_TB_PALLET { get; set; }
         public virtual DbSet<TB_PALLET_DETAIL> TB_PALLET_DETAIL { get; set; }

Models/ScpEntity/ExcelExportEnttity/SCP_INVOICE_DETAIL_EXPORT.cs

@@ -26,7 +26,7 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity
         public string 采购价 { get; set; }
 
         public string 成本价 { get; set; }
-        public string 要货日期 { get; set; }//BeginTime
+        public string 收货日期 { get; set; }
       
         public string 开票数量 { get; set; }//Qty
         public string 备注 { get; set; }//Remark

Models/ScpEntity/V_ARRIVE_PO_REPORT.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace CK.SCP.Models.ScpEntity
+{
+   public partial class V_ARRIVE_PO_REPORT
+    {
+        [Key ]
+        [Column(Order = 1)]
+        [StringLength(50)]
+        public string PoBillNum { get; set; }
+        [Key]
+        [Column(Order = 2)]
+        public int PoLine { get; set; }
+        [Key]
+        [Column(Order = 3)]
+        [StringLength(50)]
+        public string PartCode { get; set; }
+        [StringLength(50)]
+        public string PartDesc1 { get; set; }
+        [StringLength(50)]
+        public string VendName { get; set; }
+        public decimal PlanQty { get; set; }
+        public DateTime BeginTime { get; set; }
+        public decimal CanQty { get; set; }
+        public decimal AskQty { get; set; }
+        public decimal AsnQty { get; set; }
+        public decimal OnRoadQty { get; set; }
+        public decimal ArriveQty { get; set; }
+        [Key]
+        [Column(Order = 4)]
+        public DateTime ShipTime { get; set; }
+        [NotMapped]
+        public DateTime? BeginTimeEnd { get; set; }
+        [NotMapped]
+        public DateTime? ShipTimeEnd { get; set; }
+    }
+}

Models/UniApiEntity/xxqad_pt_mstr.cs

@@ -25,7 +25,7 @@ namespace CK.SCP.Models.UniApiEntity
         public string xxqad_pt_site { get; set; }
 
                 [Required(AllowEmptyStrings = true)]
-        [StringLength(2)]
+        [StringLength(4)]
         public string xxqad_pt_um { get; set; }
 
                 [Required(AllowEmptyStrings = true)]

Models/UniApiEntity/xxwms_rc_det.cs

@@ -20,7 +20,7 @@ namespace CK.SCP.Models.UniApiEntity
         public string xxwms_rc_ps_nbr { get; set; }
 
                 [Required(AllowEmptyStrings = true)]
-        [StringLength(8)]
+        [StringLength(50)]
         public string xxwms_rc_po_nbr { get; set; }
 
         public int xxwms_rc_po_line { get; set; }
@@ -38,7 +38,7 @@ namespace CK.SCP.Models.UniApiEntity
         public string xxwms_rc_site { get; set; }
 
         [Required(AllowEmptyStrings = true)]
-        [StringLength(8)]
+        [StringLength(50)]
         public string xxwms_rc_vend { get; set; }
 
         [StringLength(20)]

SCP/SCP.csproj

@@ -2933,6 +2933,7 @@
     <Content Include="Views\PlanData\SCP_RECEIVE_EXTEND.aspx" />
     <Content Include="Views\PlanData\SCP_ASK_UNCOMPLETE.aspx" />
     <Content Include="Views\PlanData\SCP_UNI_API.aspx" />
+    <Content Include="Views\Report\SCP_ARRIVE_REPORT.aspx" />
     <Content Include="Views\Report\SCP_OTD_REPORT.aspx" />
     <Content Include="Views\Report\SCP_RECVICE_YEAR_REPORT.aspx" />
     <Content Include="Views\Report\SCP_RECVICE_REPORT.aspx" />
@@ -5263,6 +5264,13 @@
     <Compile Include="Views\PlanData\SCP_UNI_API.aspx.designer.cs">
       <DependentUpon>SCP_UNI_API.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Views\Report\SCP_ARRIVE_REPORT.aspx.cs">
+      <DependentUpon>SCP_ARRIVE_REPORT.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Views\Report\SCP_ARRIVE_REPORT.aspx.designer.cs">
+      <DependentUpon>SCP_ARRIVE_REPORT.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Views\Report\SCP_OTD_REPORT.aspx.cs">
       <DependentUpon>SCP_OTD_REPORT.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SCP/Views/Report/SCP_ARRIVE_REPORT.aspx

@@ -0,0 +1,95 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_ARRIVE_REPORT.aspx.cs" Inherits="SCP.Views.Report.SCP_ARRIVE_REPORT" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Title="" Layout="VBox" BoxConfigAlign="Stretch" BoxConfigPosition="Start">
+            <Items>
+                <f:Form runat="server">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:Button ID="btnRefresh" runat="server" Text="刷新" EnablePostBack="True" Icon="Reload" OnClientClick="location.reload();">
+                                </f:Button>
+                                 <f:Button ID="btnOutput" runat="server" Text="导出" OnClick="btnOutput_Click" Icon="PageExcel">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                </f:Form>
+
+                <f:Form BodyPadding="10px" Height="100px" ID="extForm1"
+                    runat="server" Title="" ShowHeader="false">
+                    <Rows>
+                        <f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_1" runat="server">
+                            <Items>
+                                <f:TextBox runat="server" Label="订单号" ID="TextPoBillNum">
+                                </f:TextBox>
+                                <f:TextBox runat="server" Label="零件号编号" ID="TextPartCode">
+                                </f:TextBox>
+                                <f:TextBox runat="server" Label="零件号名称" ID="TextPartDesc1">
+                                </f:TextBox>
+                                <f:TextBox runat="server" Label="厂家名称" ID="TextVendName">
+                                </f:TextBox>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow2" runat="server">
+                            <Items>
+                                <f:DatePicker runat="server" Label="订单需求日期" ID="DateBeginTimeB"></f:DatePicker>
+                                <f:DatePicker runat="server" Label="至" ID="DateBeginTimeE"></f:DatePicker>
+                                <f:DatePicker runat="server" Label="实际收货日期" ID="DateShipTimeB"></f:DatePicker>
+                                <f:DatePicker runat="server" Label="至" ID="DateShipTimeE"></f:DatePicker>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow ColumnWidths="25% 25% " ID="FormRow_3" runat="server">
+                            <Items>
+                                <f:Button runat="server" ID="btnQuery" Text="查询" OnClick="btnSearch_Click"></f:Button>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+                <f:Grid ID="GridView" ShowBorder="true" ShowHeader="false" PageSize="100" BoxFlex="1" CssClass="maingrid"
+                    runat="server" DataKeyNames="PoBillNum,PartCode,PartDesc1,PoLine,VendName,PlanQty,BeginTime,CanQty,AskQty,AsnQty,OnRoadQty,ArriveQty,ShipTime"
+                    IsDatabasePaging="true" AllowPaging="true" SortField="PoBillNum" SortDirection="DESC" OnPageIndexChange="Grid_V_ARRIVE_PO_REPORT_PageIndexChange"
+                    AutoScroll="True" EnableRowDoubleClickEvent="True" OnSort="GridView_Sort" AllowSorting="true">
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
+                            runat="server">
+                            <f:ListItem Text="100" Value="100" />
+                            <f:ListItem Text="200" Value="200" />
+                        </f:DropDownList>
+                    </PageItems>
+                    <Columns>
+                        <f:BoundField runat="server" Width="100px" SortField="PoBillNum" HeaderText="订单号" ColumnID="" DataField="PoBillNum" />
+                        <f:BoundField runat="server" Width="100px" SortField="PartCode" HeaderText="零件编号" ColumnID="" DataField="PartCode" />
+                        <f:BoundField runat="server" Width="100px" SortField="PartDesc1" HeaderText="零件名称" ColumnID="" DataField="PartDesc1" />
+                        <f:BoundField runat="server" Width="80px" SortField="PoLine" HeaderText="订单行号" ColumnID="" DataField="PoLine" />
+                        <f:BoundField runat="server" Width="90px" SortField="VendName" HeaderText="厂家名称" ColumnID="" DataField="VendName" />
+                        <f:BoundField runat="server" Width="80px" HeaderText="订单需求数量" DataFormatString="{0:F0}" ColumnID="" DataField="PlanQty" />
+                        <f:BoundField runat="server" Width="100px" SortField="BeginTime" DataField="BeginTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="订单需求日期" />
+                        <f:BoundField runat="server" Width="100px" HeaderText="订单未完成数量" DataFormatString="{0:F0}" ColumnID="" DataField="CanQty" />
+                        <f:BoundField runat="server" Width="80px" HeaderText="要货数量" DataFormatString="{0:F0}" ColumnID="" DataField="AskQty" />
+                        <f:BoundField runat="server" Width="80px" HeaderText="发货数量" DataFormatString="{0:F0}" ColumnID="" DataField="AsnQty" />
+                        <f:BoundField runat="server" Width="80px" HeaderText="在途数量" DataFormatString="{0:F0}" ColumnID="" DataField="OnRoadQty" />
+                        <f:BoundField runat="server" Width="80px" HeaderText="收货数量" DataFormatString="{0:F0}" ColumnID="" DataField="ArriveQty" />
+                        <f:BoundField runat="server" Width="90px" SortField="ShipTime" DataField="ShipTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="实际收货日期" />
+                    </Columns>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>

SCP/Views/Report/SCP_ARRIVE_REPORT.aspx.cs

@@ -0,0 +1,161 @@
+using CK.SCP.Controller;
+using CK.SCP.Models.ScpEntity;
+using FineUI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace SCP.Views.Report
+{
+    public partial class SCP_ARRIVE_REPORT : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                LoadData();
+            }
+        }
+        public void LoadData()
+        {
+            BindData();
+        }
+        public void BindData()
+        {
+            SearchV_TB_INCOMPLETE_ASKData((result) => {
+                GridView.RecordCount = result.Count();
+                var list = SortAndPage<V_ARRIVE_PO_REPORT>(result, GridView);
+                GridView.DataSource = list;
+                GridView.DataBind();
+            });
+        }
+        public void SearchV_TB_INCOMPLETE_ASKData(Action<IQueryable<V_ARRIVE_PO_REPORT>> p_action)
+        {
+            V_ARRIVE_PO_REPORT _entity = new V_ARRIVE_PO_REPORT();
+            if (TextPoBillNum.Text != null)
+            {
+                _entity.PoBillNum = TextPoBillNum.Text;
+            }
+            if (TextPartCode.Text != null)
+            {
+                _entity.PartCode = TextPartCode.Text;
+            }
+            if (TextPartDesc1.Text != null)
+            {
+                _entity.PartDesc1 = TextPartDesc1.Text;
+            }
+            if (TextVendName.Text != null)
+            {
+                _entity.VendName = TextVendName.Text;
+            }
+            if (DateBeginTimeB.SelectedDate != null)
+            {
+                _entity.BeginTime = (DateTime)DateBeginTimeB.SelectedDate;
+            }
+            if (DateBeginTimeE.SelectedDate != null)
+            {
+                _entity.BeginTimeEnd = (DateTime)DateBeginTimeE.SelectedDate;
+            }
+            if (DateShipTimeB.SelectedDate != null)
+            {
+                _entity.ShipTime = (DateTime)DateShipTimeB.SelectedDate;
+            }
+            if (DateShipTimeE.SelectedDate != null)
+            {
+                _entity.ShipTimeEnd = (DateTime)DateShipTimeE.SelectedDate;
+            }
+            SCP_REPORT_CONTROLLER.Get_V_ARRIVE_PO_REPORT(_entity, (_ret) =>
+            {
+                if (_ret.State == ReturnStatus.Succeed)
+                {
+                    p_action(_ret.Result);
+                }
+            });
+        }
+        protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
+            BindData();
+        }
+        protected void Grid_V_ARRIVE_PO_REPORT_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            GridView.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
+            BindData();
+        }
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindData();
+        }
+        protected void GridView_Sort(object sender, GridSortEventArgs e)
+        {
+            GridView.SortDirection = e.SortDirection;
+            GridView.SortField = e.SortField;
+            BindData();
+        }
+        protected void btnOutput_Click(object sender, EventArgs e)
+        {
+            var _entity = new V_ARRIVE_PO_REPORT();
+            if (TextPoBillNum.Text != null)
+            {
+                _entity.PoBillNum = TextPoBillNum.Text;
+            }
+            if (TextPartCode.Text != null)
+            {
+                _entity.PartCode = TextPartCode.Text;
+            }
+            if (TextPartDesc1.Text != null)
+            {
+                _entity.PartDesc1 = TextPartDesc1.Text;
+            }
+            if (TextVendName.Text != null)
+            {
+                _entity.VendName = TextVendName.Text;
+            }
+            if (DateBeginTimeB.SelectedDate != null)
+            {
+                _entity.BeginTime = (DateTime)DateBeginTimeB.SelectedDate;
+            }
+            if (DateBeginTimeE.SelectedDate != null)
+            {
+                _entity.BeginTimeEnd = (DateTime)DateBeginTimeE.SelectedDate;
+            }
+            if (DateShipTimeB.SelectedDate != null)
+            {
+                _entity.ShipTime = (DateTime)DateShipTimeB.SelectedDate;
+            }
+            if (DateShipTimeE.SelectedDate != null)
+            {
+                _entity.ShipTimeEnd = (DateTime)DateShipTimeE.SelectedDate;
+            }
+            SCP_REPORT_CONTROLLER.Get_V_ARRIVE_PO_REPORT(_entity, (ret) =>
+            {
+                if (ret.State == ReturnStatus.Succeed)
+                {
+                    Dictionary<string, string> cellheader = new Dictionary<string, string>
+                {
+                        { "PoBillNum", "订单号" },
+                        { "PartCode", "零件编号" },
+                        { "PartDesc1", "零件名称" },
+                        { "PoLine", "订单行号" },
+                        { "VendName", "厂家名称" },
+                        { "PlanQty", "订单需求数量" },
+                        { "BeginTime", "订单需求日期" },
+                        { "CanQty", "订单未完成数量" },
+                        { "AskQty", "要货数量" },
+                        { "AsnQty", "发货数量" },
+                        { "OnRoadQty", "在途数量" },
+                        { "ArriveQty", "收货数量" },
+                        { "ShipTime", "实际收货日期" },
+
+                    };
+
+                    string url = EntityListToExcel2003(cellheader, ret.Result.ToList(), "未完成订单明细");
+                }
+            });
+
+        }
+    }
+}

SCP/Views/Report/SCP_ARRIVE_REPORT.aspx.designer.cs

@@ -0,0 +1,224 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace SCP.Views.Report
+{
+
+
+    public partial class SCP_ARRIVE_REPORT
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Panel Panel1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// btnRefresh 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Button btnRefresh;
+
+        /// <summary>
+        /// btnOutput 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Button btnOutput;
+
+        /// <summary>
+        /// extForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Form extForm1;
+
+        /// <summary>
+        /// FormRow_1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.FormRow FormRow_1;
+
+        /// <summary>
+        /// TextPoBillNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextPoBillNum;
+
+        /// <summary>
+        /// TextPartCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextPartCode;
+
+        /// <summary>
+        /// TextPartDesc1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextPartDesc1;
+
+        /// <summary>
+        /// TextVendName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextVendName;
+
+        /// <summary>
+        /// FormRow2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.FormRow FormRow2;
+
+        /// <summary>
+        /// DateBeginTimeB 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker DateBeginTimeB;
+
+        /// <summary>
+        /// DateBeginTimeE 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker DateBeginTimeE;
+
+        /// <summary>
+        /// DateShipTimeB 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker DateShipTimeB;
+
+        /// <summary>
+        /// DateShipTimeE 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker DateShipTimeE;
+
+        /// <summary>
+        /// FormRow_3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.FormRow FormRow_3;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Button btnQuery;
+
+        /// <summary>
+        /// GridView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.Grid GridView;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlGridPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DropDownList ddlGridPageSize;
+    }
+}

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx

@@ -119,12 +119,8 @@
                         </f:FormRow>                
                     </Items>
                 </f:Form>
-
+                <f:Grid  id="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="200" BoxFlex="1" CssClass="maingrid" 
-
+                    runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True"  SortField="BillType;PartCode" OnSort="Grid1_Sort" AllowSorting="true"
-
-
-                <f:Grid  id="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid" 
-                    runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True"  SortField="BillType;ShipTime"
                     AutoScroll="True" OnPageIndexChange="Grid_V_TB_RECEIVE_LIST_PageIndexChange" EnableCheckBoxSelect = "true"  OnRowDataBound="Grid_V_TB_RECEIVE_LIST_RowDataBound" >
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -132,10 +128,10 @@
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_OnSelectedIndexChanged"  runat="server">
-                            <f:ListItem Text="100" Value="100" />
                               <f:ListItem Text="200" Value="200" />
                               <f:ListItem Text="500" Value="500" />
                              <f:ListItem Text="1000" Value="1000" />
+                            <f:ListItem Text="5000" Value="5000" />
                         </f:DropDownList>
                     </PageItems>
                     <Columns>
@@ -146,15 +142,15 @@
                             </ItemTemplate>
                         </f:TemplateField>--%>
                      
-                        <f:BoundField runat="server" HeaderText="项目编码"  DataField="ProjectId" width="80"/>
+                        <f:BoundField runat="server" HeaderText="项目编码" SortField="ProjectId"  DataField="ProjectId" width="80"/>
-                        <f:BoundField runat="server" HeaderText="单据类型" ColumnID="BillType_DESC" DataField="BillType_DESC" width="80"/>
+                        <f:BoundField runat="server" HeaderText="单据类型" SortField="BillType_DESC" ColumnID="BillType_DESC" DataField="BillType_DESC" width="80"/>
-                         <f:BoundField runat="server" HeaderText="ERP单据号" ColumnID="ErpRecvBillNum" DataField="ErpRecvBillNum" width="80" />
+                         <f:BoundField runat="server" HeaderText="ERP单据号" SortField="ErpRecvBillNum" ColumnID="ErpRecvBillNum" DataField="ErpRecvBillNum" width="80" />
-                        <f:BoundField runat="server" HeaderText="WMS单据号" ColumnID="RecvBillNum" DataField="RecvBillNum" width="80" />
+                        <f:BoundField runat="server" HeaderText="WMS单据号" SortField="RecvBillNum" ColumnID="RecvBillNum" DataField="RecvBillNum" width="80" />
-                        <f:BoundField runat="server" HeaderText="发货单号" ColumnID="AsnBillNum" DataField="AsnBillNum" width="80"/>                        
+                        <f:BoundField runat="server" HeaderText="发货单号"  SortField="AsnBillNum" ColumnID="AsnBillNum" DataField="AsnBillNum" width="80"/>                        
-                        <f:BoundField runat="server" HeaderText="供应商" ColumnID="VendName" DataField="VendName" />
+                        <f:BoundField runat="server" HeaderText="供应商" SortField="VendName" ColumnID="VendName" DataField="VendName" />
-                        <f:BoundField runat="server" HeaderText="供应商编码"  DataField="VendId" width="80"/>
+                        <f:BoundField runat="server" HeaderText="供应商编码"  SortField="VendId" DataField="VendId" width="80"/>
-                        <f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="PoBillNum" width="80"/>
+                        <f:BoundField runat="server" HeaderText="订单号" SortField="PoBillNum" ColumnID="PoBillNum" DataField="PoBillNum" width="80"/>
-                        <f:BoundField runat="server" HeaderText="订单行" ColumnID="" DataField="PoLine" width="50" />
+                        <f:BoundField runat="server" HeaderText="订单行" SortField="PoLine" ColumnID="PoLine" DataField="PoLine" width="50" />
                         <f:BoundField runat="server" HeaderText="单价" ColumnID="" DataField="Price" width="80"/>
 
                         <f:BoundField runat="server" HeaderText="采购价格" ColumnID="" DataField="PurPrice" width="80"/>
@@ -166,15 +162,15 @@
                                 <asp:Label runat="server" DataField="Qty"  ID="Qty1" Text='<%# Eval("CanQty") %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:BoundField runat="server" HeaderText="零件号" ColumnID="" DataField="PartCode" width="80"/>
+                        <f:BoundField runat="server" HeaderText="零件号" SortField="PartCode" ColumnID="PartCode" DataField="PartCode" width="80"/>
-                        <f:BoundField runat="server" HeaderText="零件名称" ColumnID="" DataField="PartDesc1" />
+                        <f:BoundField runat="server" HeaderText="零件名称"  SortField="PartDesc1" ColumnID="PartDesc1" DataField="PartDesc1" />
-                        <f:BoundField runat="server" HeaderText="单位" ColumnID="LocUnit" DataField="LocUnit" width="50"/>
+                        <f:BoundField runat="server" HeaderText="单位" SortField="LocUnit" ColumnID="LocUnit" DataField="LocUnit" width="50"/>
-                        <f:BoundField runat="server" HeaderText="币种" ColumnID="Currency" DataField="Currency" width="50"/>
+                        <f:BoundField runat="server" HeaderText="币种" SortField="Currency" ColumnID="Currency" DataField="Currency" width="50"/>
                         
-                         <f:BoundField runat="server" HeaderText="Erp收货单税率" ColumnID="Tax" DataField="Tax" width="50" Hidden="true"/>                        
+                         <f:BoundField runat="server" HeaderText="Erp收货单税率" SortField="Tax" ColumnID="Tax" DataField="Tax" width="50" Hidden="true"/>                        
                     
-                        <f:BoundField runat="server" HeaderText="要货日期" ColumnID="BeginTime" DataField="BeginTime" Hidden="true"/>
+                        <f:BoundField runat="server" HeaderText="要货日期" SortField="BeginTime" ColumnID="BeginTime" DataField="BeginTime" Hidden="true"/>
-                        <f:BoundField runat="server" HeaderText="收货时间" ColumnID="CreateTime" DataField="ShipTime" DataFormatString="{0:yyyy-MM-dd}" />
+                        <f:BoundField runat="server" HeaderText="收货时间"  SortField="CreateTime" ColumnID="CreateTime" DataField="ShipTime" DataFormatString="{0:yyyy-MM-dd}" />
                         <f:BoundField runat="server" HeaderText="备注" ColumnID="Remark" DataField="Remark" />
                     </Columns>
                 </f:Grid>

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs

@@ -13,6 +13,7 @@ using FineUI;
 using SCP.Code;
 using System.Drawing;
 using CK.SCP.Models.Enums;
+using CK.SCP.Models;
 
 namespace SCP.SupplierData
 {
@@ -302,14 +303,20 @@ namespace SCP.SupplierData
                         
                     
                     }
+                    if(!ScpCache.Config.负数发票)
+                    {
                     if (_total < 0)
                     {
                         Alert.Show("不允许开负数发票！退货、索赔零件数量有问题,请联系工厂库房和质量解决!");
                         return;
                     }
-                    if (IdList.Count > 200)
+                    }
+
+
+
+                if (IdList.Count > 1000)
                 {
-                        Alert.Show("选择零件记录超过,发票允许条数!");
+                    Alert.Show("选择发票条数"+ IdList.Count + "超过1000条,发票允许条数!");
                     return;
                 }
 
@@ -323,7 +330,7 @@ namespace SCP.SupplierData
 
                     if (IDS != "") IDS = IDS.Substring(0, IDS.Length - 1);
 
-                    if (CurrentUser.FactoryList.FirstOrDefault() != "BJCIAI")
+                    if (CurrentUser.FactoryList.FirstOrDefault() != "BJCIAI"&& CurrentUser.FactoryList.FirstOrDefault() != "JZ1")
                     {
                         var _ls = GetIsAllChecked(vender, IDS);
                         if (_ls.Count > 0)
@@ -504,7 +511,12 @@ namespace SCP.SupplierData
             Session["InvoiceCreateQueryParm"] = null;
             BindData();
         }
-
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid_V_TB_RECEIVE_LIST.SortDirection = e.SortDirection;
+            Grid_V_TB_RECEIVE_LIST.SortField = e.SortField;
+            BindData();
+        }
         protected void btnCreateAll_Click(object sender, EventArgs e)
         {
             CreateInvoice("1");

SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx

@@ -68,14 +68,14 @@
                                     <Items> 
                                           <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Readonly="true" Enabled="false"/>    
                                           <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额"  Readonly="true" Enabled="false"/>      
-                                        <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额"   Readonly="true" Enabled="false"/>                                                                             
+                                        <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额(不含税)"   Readonly="true" Enabled="false"/>                                                                             
                                         <f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额"  MaxValue="1" Hidden="true"  />
                                          <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />                                                       
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25% " ID="FormRow_4">
                                     <Items>
-                                          <f:TextBox ID="txtInvoiceNumber" runat="server" Label="金税票号" Text="" MaxLength="22" Readonly="true" Enabled="false">
+                                          <f:TextBox ID="txtInvoiceNumber" runat="server" Label="金税票号" Text="" MaxLength="20" Readonly="true" Enabled="false">
                                         </f:TextBox>
                                         <f:TextBox ID="txtExpressNumber" runat="server" Label="快递单号" Text="" MaxLength="100" Readonly="true" Enabled="false">
                                         </f:TextBox> 

SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM.aspx.cs

@@ -73,10 +73,10 @@ namespace SCP.Views.锦州锦恒.WarehouseData
 
             _entity.VendId = ddl_Vender.SelectedValue;
             _entity.InvoiceNum = TXT_InvoiceNum.Text;
-
+            if (DP_CreateTime1.SelectedDate != null || DP_CreateTime2.SelectedDate != null || !string.IsNullOrEmpty(TXT_PO.Text) || !string.IsNullOrEmpty(TXT_ASN.Text))
-
+            {
                 _entity.InvoiceList = SCP_INVOICE_CONTROLLER.Get_V_TB_INVOICE_BY_TIME(DP_CreateTime1.Text, DP_CreateTime2.Text, TXT_PO.Text, TXT_ASN.Text);
-
+            }
             _entity.UserInVendIds = CurrentUser.VenderList;
             _entity.UserInAddress = CurrentUser.FactoryList;
             _entity.BillStateList = GetStateList();
@@ -85,10 +85,6 @@ namespace SCP.Views.锦州锦恒.WarehouseData
             {
                 if (ret.State == ReturnStatus.Succeed)
                 {
-                    if (_entity.InvoiceList == null || _entity.InvoiceList.Count == 0)
-                    {
-                        Alert.Show("未查询到符合条件的发票！");
-                    }
                     p_action(ret.Result);
                 }
             });

SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx

@@ -63,7 +63,7 @@
                                     <Items>               
                                          <f:TextBox ID="txtExtend1" runat="server" Label="实际税前金额" Text="0" MaxLength="100" Enabled="false"/>
                                          <f:TextBox ID="txtExtend2" runat="server" Label="实际税额" Text="0" MaxLength="100" Enabled="false"/>
-                                        <f:TextBox ID="txtDiscountPrice1" runat="server" Label="折扣金额" Text="0" MaxLength="100" Enabled="false"/>
+                                        <f:TextBox ID="txtDiscountPrice1" runat="server" Label="折扣金额(不含税)" Text="0" MaxLength="100" Enabled="false"/>
                                         <f:TextBox ID="txtBlancePrice1" runat="server" Label="调整税额" Text="0" MaxLength="100" Enabled="false" Hidden="true"/>
                                            <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />               
                                     </Items>

SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx

@@ -56,7 +56,7 @@
                             <Items>
                                 <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Enabled="false" />
                                 <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额" Enabled="false" />
-                                <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额" Enabled="false" />
+                                <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额(不含税)" Enabled="false" />
 
                                 <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />
                             </Items>

SCP/Views/青岛一汽法雷奥/PlanData/SCP_ASK.aspx.cs

@@ -107,7 +107,6 @@ namespace SCP.Views.青岛一汽法雷奥.PlanData
             }
             if (!string.IsNullOrEmpty(CurrentUser.Name))
             {
-                _entity.CreateUser = CurrentUser.Name;
                 if (CurrentUser.Name != "admin")
                 {
                     if (CurrentUser.FactoryList != null && CurrentUser.FactoryList.Count > 0)

SCP/Views/青岛一汽法雷奥/PlanData/SCP_PO.aspx

@@ -104,10 +104,9 @@
 
                     </Items>
                 </f:GroupPanel>
-
                <f:Grid ID = "Grid_V_TB_PO"  EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true"  runat ="server" EnableCheckBoxSelect = "true" EnableTextSelection="true"
 			       DataKeyNames = "UID,PoBillNum,ErpBillNum,VendId,ModType,Contacter,Site,Buyer,BuyerPhone,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,VendName,State_DESC,ModType_DESC" 
-                     CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime"
+                     CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime" AllowSorting="true"
                      IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_PO_RowDoubleClick" BoxFlex="1"
                     AutoScroll="True"  PageSize="50"  SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange"  >
                      <PageItems>

SCP/Views/青岛一汽法雷奥/SupplierData/SCP_ASN_CREATE.aspx.cs

@@ -230,7 +230,7 @@ namespace SCP.青岛一汽法雷奥.SupplierData
                         Alert.Show("日期填写错误!");
                         return;
                     }
-                    if (_Batch1.ToString().Trim() != "" && ConvertHelper.To<decimal>(_Qty1) > 0)
+                 //   if (_Batch1.ToString().Trim() != "" && ConvertHelper.To<decimal>(_Qty1) > 0)
                         if (ConvertHelper.To<decimal>(_Qty1) > 0)
                     {
                         V_TB_ASK_DETAIL _detail = ConvertHelper.GetObjectClone<V_TB_ASK_DETAIL>(_entity);

SCP/default.aspx

@@ -111,10 +111,10 @@
 
         for (var i = 0; obj.options.length; i++)
         {
-            if ('BJCIAI' == obj.options[i].value) {
+            if ('QDVALEO' == obj.options[i].value) {
                 obj.options[i].selected = true;
                 _factory = document.getElementById(_factoryValue);
-                _factory.value = 'BJCIAI';
+                _factory.value = 'QDVALEO';
             }
         }
     }

UniApiGroup/Controller/OdbcApiScpController.cs

@@ -33,7 +33,7 @@ namespace CK.SCP.GrupUniApi.Controller
                 xxscm_wms = ((int)UniApiState.待执行).ToString(),
                 xxscm_rmks = "",
                 xxscm_domain =p_domain,
-                xxscm_site = !string.IsNullOrEmpty(p_site)?p_site:p_domain,
+                xxscm_site = (!string.IsNullOrEmpty(p_site))?p_site: p_domain,
                 //xxscm_create_time = DateTime.Now,
             };
             idb.xxscm_ctrl.Add(wmsCtrl);