diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj
index 63dd90b..b3258f1 100644
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@@ -4501,7 +4501,6 @@
-
@@ -5561,13 +5560,6 @@
SCP_INVOICE.aspx
-
- SCP_RECEIVE_LIST.aspx
- ASPXCodeBehind
-
-
- SCP_RECEIVE_LIST.aspx
-
SCP_RECEIVE_VIEW.aspx
ASPXCodeBehind
diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
index 6787c0f..37fd93f 100644
--- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
+++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
@@ -122,7 +122,7 @@
diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
index 7250706..c9b1323 100644
--- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
+++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
@@ -16,6 +16,7 @@ using CK.SCP.Models.Enums;
namespace SCP.SupplierData
{
+
public partial class ReceiveList : PageBase
{
protected void Page_Load(object sender, EventArgs e)
@@ -277,12 +278,19 @@ namespace SCP.SupplierData
List _rejList = new List();
string _projectId = string.Empty;
List _recList = new List();
-
+ List IdList = new List();
+ decimal _total = 0;
for (int i = 0; i < Grid_V_TB_RECEIVE_LIST.SelectedRowIndexArray.Length; i++)
{
int rowIndex = Grid_V_TB_RECEIVE_LIST.SelectedRowIndexArray[i];
int ID = Convert.ToInt32(Grid_V_TB_RECEIVE_LIST.DataKeys[rowIndex][0]);
+
+ decimal _qty = decimal.Parse(Grid_V_TB_RECEIVE_LIST.DataKeys[rowIndex][5].ToString());
+
+ decimal _price = decimal.Parse(Grid_V_TB_RECEIVE_LIST.DataKeys[rowIndex][6].ToString());
+
+ _total += (_qty * _price);
IDS += ID + ",";
_projectId = Grid_V_TB_RECEIVE_LIST.DataKeys[rowIndex][1].ToString();
_projectList.Add(_projectId);
@@ -291,12 +299,22 @@ namespace SCP.SupplierData
{
_rejList.Add(_projectId);
}
+ IdList.Add(ID);
}
+ if (_total < 0)
+ {
+ Alert.Show("不允许开负数发票!退货、索赔零件数量有问题,请联系工厂库房和质量解决!");
+ return;
+ }
-
+ if (IdList.Count > 200)
+ {
+ Alert.Show("选择零件记录超过,发票允许条数!");
+ return;
+ }
//if (CurrentUser.FactoryList.FirstOrDefault() == "CNS")
//{
// if (_projectList.Distinct().Count() > 1)
@@ -335,14 +353,25 @@ namespace SCP.SupplierData
return;
}
}
-
- MyQueryStringEnCode me = new MyQueryStringEnCode("ReceiveID=" + IDS + "&VendId=" + vender + "&Modify=" + IsCreate + "&IsAll=" + p_all + "&Tax=" + _tax + "&CJ=" + _cj + "&TZ=" + _tz);
- if (me.QueryString.Length > 2000)
- {
- Alert.Show("选择零件记录超过,发票允许条数!");
- return;
- }
- string ret = Window1.GetShowReference("../../Views/SupplierData/SCP_INVOICE_CREATE.aspx?" + me.QueryString, "生成发票");
+
+
+ InvoiceCreateQueryParm parm = new InvoiceCreateQueryParm();
+ parm.ReceiveID = IDS;
+ parm.VendId = vender;
+ parm.Modify = IsCreate;
+ parm.IsAll = p_all;
+ parm.Tax = _tax;
+ parm.CJ = _cj;
+ parm.TZ = _tz;
+
+ //MyQueryStringEnCode me = new MyQueryStringEnCode("ReceiveID=" + IDS + "&VendId=" + vender + "&Modify=" + IsCreate + "&IsAll=" + p_all + "&Tax=" + _tax + "&CJ=" + _cj + "&TZ=" + _tz);
+ //if (me.QueryString.Length > 2000)
+ //{
+ // Alert.Show("选择零件记录超过,发票允许条数!");
+ // return;
+ //}
+ Session["InvoiceCreateQueryParm"] = parm;
+ string ret = Window1.GetShowReference("../../Views/SupplierData/SCP_INVOICE_CREATE.aspx", "生成发票");
PageContext.RegisterStartupScript(ret);
});
}
@@ -500,6 +529,7 @@ namespace SCP.SupplierData
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
+ Session["InvoiceCreateQueryParm"] = null;
BindData();
}
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx
deleted file mode 100644
index 4039cdf..0000000
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx
+++ /dev/null
@@ -1,127 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_RECEIVE_LIST.aspx.cs" Inherits="SCP.WarehouseData.ReceiveList" %>
-
-<%@ Import Namespace="CK.SCP.Utils" %>
-<%@ Import Namespace="CK.SCP.Models.Enums" %>
-
-
-
-
-
-
-
-
-
-
-
- <%--
- --%>
-
-
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.cs
deleted file mode 100644
index b8e4fdc..0000000
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using CK.SCP.Models.AppBoxEntity;
-using CK.SCP.Models.ScpEntity;
-using CK.SCP.Controller;
-using FineUI;
-using SCP.Code;
-using System.Drawing;
-using CK.SCP.Models.Enums;
-
-namespace SCP.WarehouseData
-{
- public partial class ReceiveList : PageBase
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- if (!IsPostBack)
- {
- LoadData();
- }
- }
- public void LoadData()
- {
- // 每页记录数
- Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
- ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
- BindData();
- }
- private void SearchData(Action> p_action)
- {
- V_TB_RECEIVE_LIST _ls = new V_TB_RECEIVE_LIST();
- _ls.VendId = Request.Params["VendId"];
- SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_LIST_List(_ls, (ret) =>
- {
- if (ret.State == ReturnStatus.Succeed)
- {
- p_action(ret.Result);
- }
- });
- }
- public void BindData()
- {
- SearchData(ret =>
- {
- Grid_V_TB_RECEIVE_LIST.RecordCount = ret.Count();
- ret = SortAndPage(ret, Grid_V_TB_RECEIVE_LIST, "DESC");
- List temp = ret.ToList();
- Grid_V_TB_RECEIVE_LIST.DataSource= temp;
- Grid_V_TB_RECEIVE_LIST.DataBind();
- });
- // 排列和数据库分页
- }
- protected void Grid1_OnPageIndexChange(object sender, GridPageEventArgs e)
- {
- Grid_V_TB_RECEIVE_LIST.PageIndex = e.NewPageIndex;
- BindData();
- }
-
- protected void ddlGridPageSize_OnSelectedIndexChanged(object sender, EventArgs e)
- {
- Grid_V_TB_RECEIVE_LIST.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
- BindData();
- }
- //生成发票
-
-
- protected void Grid_V_TB_RECEIVE_LIST_PageIndexChange(object sender, GridPageEventArgs e)
- {
- BindData();
- }
-
- //导出
-
- protected void BtnSearch_Click(object sender, EventArgs e)
- {
- BindData();
- }
-
- protected void Grid_V_TB_RECEIVE_LIST_RowDataBound(object sender, GridRowEventArgs e)
- {
-
- System.Web.UI.WebControls.Label _label= (System.Web.UI.WebControls.Label)Grid_V_TB_RECEIVE_LIST.Rows[e.RowIndex].FindControl("Qty1");
- if (!string.IsNullOrEmpty(_label.Text))
- {
- if (decimal.Parse(_label.Text) < 0)
- {
- _label.ForeColor = Color.Red;
- }
- }
- }
-
-
- protected void BTN_INV_Click(object sender, EventArgs e)
- {
- BindData();
- }
-
- protected void Window1_Close(object sender, WindowCloseEventArgs e)
- {
- BindData();
- }
- }
-}
\ No newline at end of file
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.designer.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.designer.cs
deleted file mode 100644
index 2ef983b..0000000
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_LIST.aspx.designer.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
-//
-// 对此文件的更改可能导致不正确的行为,如果
-// 重新生成代码,则所做更改将丢失。
-// 自动生成>
-//------------------------------------------------------------------------------
-
-namespace SCP.WarehouseData {
-
-
- public partial class ReceiveList {
-
- ///
- /// form1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
- ///
- /// Panel1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Panel Panel1;
-
- ///
- /// Grid_V_TB_RECEIVE_LIST 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Grid Grid_V_TB_RECEIVE_LIST;
-
- ///
- /// ToolbarSeparator1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.ToolbarSeparator ToolbarSeparator1;
-
- ///
- /// ToolbarText1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.ToolbarText ToolbarText1;
-
- ///
- /// ddlGridPageSize 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.DropDownList ddlGridPageSize;
-
- ///
- /// Qty1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.WebControls.Label Qty1;
-
- ///
- /// Window1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUI.Window Window1;
- }
-}
diff --git a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_DELTAIL_RED.aspx.cs b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_DELTAIL_RED.aspx.cs
index 2cb55c9..5b5861b 100644
--- a/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_DELTAIL_RED.aspx.cs
+++ b/SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_DELTAIL_RED.aspx.cs
@@ -11,7 +11,7 @@ using CK.SCP.Models.Enums;
using CK.SCP.Models.ScpEntity;
using CK.SCP.Utils;
using CK.SCP.Controller;
-using CK.SCP.Utils;
+
using FineUI;