From 21d9b86a3036196db8229535a00ed220f67b0537 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 23 Nov 2020 15:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E6=9C=AA=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86/=E5=92=8C?=
=?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/SCP_ASK_CONTROLLER.cs | 16 +++++--
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx | 2 +
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs | 16 +++++++
.../SCP_INCOMPLETE_ASK.aspx.designer.cs | 9 ++++
.../WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs | 2 +-
.../Report/SCP_INCOMPLETE_ASK.aspx | 12 ++++-
.../Report/SCP_INCOMPLETE_ASK.aspx.cs | 26 ++++++++++-
.../SCP_INCOMPLETE_ASK.aspx.designer.cs | 44 +++++++++++++++++--
8 files changed, 115 insertions(+), 12 deletions(-)
diff --git a/Controller/SCP_ASK_CONTROLLER.cs b/Controller/SCP_ASK_CONTROLLER.cs
index e86c066..2fbf00a 100644
--- a/Controller/SCP_ASK_CONTROLLER.cs
+++ b/Controller/SCP_ASK_CONTROLLER.cs
@@ -375,17 +375,25 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.PartDesc1.Contains(p_entity.PartDesc1));
}
- if (p_entity.BeginTime != null)
+ if (p_entity.BeginTimeStart != null)
{
- q = q.Where(p => p.BeginTime >= p_entity.BeginTime);
+ q = q.Where(p => p.BeginTime >= p_entity.BeginTimeStart);
}
if (p_entity.BeginTimeEnd != null)
{
q = q.Where(p => p.BeginTime <= p_entity.BeginTimeEnd);
}
- if (p_entity.EndTime != null)
+ if (p_entity.EndTimeStart != null)
+ {
+ q = q.Where(p => p.EndTime >= p_entity.EndTimeStart);
+ }
+ if (p_entity.EndTimeEnd != null)
+ {
+ q = q.Where(p => p.EndTime <= p_entity.EndTimeEnd);
+ }
+ if (p_entity.VendId != null)
{
- q = q.Where(p => p.EndTime < p_entity.EndTime);
+ q = q.Where(p => p.VendId.Contains(p_entity.VendId));
}
if (p_entity.UserInAddress != null && p_entity.UserInAddress.Count > 0)
{
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
index ccc3ceb..4ed512c 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
@@ -64,6 +64,8 @@
+
+
<%--
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
index 98a49fd..f239533 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
@@ -74,6 +74,10 @@ namespace SCP.PlanData
{
_entity.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
}
+ if (TextVendId.Text != null)
+ {
+ _entity.VendId = TextVendId.Text;
+ }
if (TextBoxAskNo.Text != null)
{
_entity.AskBillNum = TextBoxAskNo.Text;
@@ -175,6 +179,18 @@ namespace SCP.PlanData
{
_ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
}
+ if (dp_EndTimeStart.SelectedDate != null)
+ {
+ _ls.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+ }
+ if (dp_EndTimeEnd.SelectedDate != null)
+ {
+ _ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+ }
+ if (TextVendId.Text != null)
+ {
+ _ls.VendId = TextVendId.Text;
+ }
if (TextBoxAskNo.Text != null)
{
_ls.AskBillNum = TextBoxAskNo.Text;
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
index 3d38a84..3135594 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
@@ -230,6 +230,15 @@ namespace SCP.PlanData
///
protected global::FineUI.FormRow FormRow_3;
+ ///
+ /// TextVendId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.TextBox TextVendId;
+
///
/// btnQuery 控件。
///
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
index ea5b405..121993f 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
@@ -216,7 +216,7 @@ namespace SCP.WarehouseData
{
if (_rec != null)
{
- int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.PoBillNum == _rec.PoBillNum).Count();
+ int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.PoBillNum == _rec.PoBillNum&&p.State!=(int)InvoiceState.Reject).Count();
if (_count > 0)
{
Alert.Show("不能取消已经开票！");
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
index 322e5aa..7d1ef1f 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
@@ -38,7 +38,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -48,7 +56,7 @@
-
+
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
index f382a1f..fc70ccf 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
@@ -44,12 +44,24 @@ namespace SCP.Views.沈阳金杯.PlanData
_entity.PoBillNum = TextBillNo.Text;
if (TextBillTime1.SelectedDate != null)
{
- _entity.BeginTime = (DateTime)TextBillTime1.SelectedDate;
+ _entity.BeginTimeStart = (DateTime)TextBillTime1.SelectedDate;
}
if (TextBillTime2.SelectedDate != null)
{
_entity.BeginTimeEnd = (DateTime)TextBillTime2.SelectedDate;
}
+ if (dp_EndTimeStart.SelectedDate != null)
+ {
+ _entity.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+ }
+ if (dp_EndTimeEnd.SelectedDate != null)
+ {
+ _entity.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+ }
+ if (TextVendId.Text != null)
+ {
+ _entity.VendId = TextVendId.Text;
+ }
if (TextBoxAskNo.Text != null)
{
_entity.AskBillNum = TextBoxAskNo.Text;
@@ -96,6 +108,18 @@ namespace SCP.Views.沈阳金杯.PlanData
{
_ls.BeginTimeEnd = (DateTime)TextBillTime2.SelectedDate;
}
+ if (dp_EndTimeStart.SelectedDate != null)
+ {
+ _ls.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+ }
+ if (dp_EndTimeEnd.SelectedDate != null)
+ {
+ _ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+ }
+ if (TextVendId.Text != null)
+ {
+ _ls.VendId = TextVendId.Text;
+ }
if (TextBoxAskNo.Text != null)
{
_ls.AskBillNum = TextBoxAskNo.Text;
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
index b354f25..ce71b19 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
@@ -114,13 +114,49 @@ namespace SCP.Views.沈阳金杯.PlanData
protected global::FineUI.DatePicker TextBillTime2;
///
- /// FormRow_2 控件。
+ /// FormRow2 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.FormRow FormRow_2;
+ protected global::FineUI.FormRow FormRow2;
+
+ ///
+ /// TextVendId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.TextBox TextVendId;
+
+ ///
+ /// dp_EndTimeStart 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.DatePicker dp_EndTimeStart;
+
+ ///
+ /// dp_EndTimeEnd 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.DatePicker dp_EndTimeEnd;
+
+ ///
+ /// FormRow_3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUI.FormRow FormRow_3;
///
/// TextBoxAskNo 控件。
@@ -150,13 +186,13 @@ namespace SCP.Views.沈阳金杯.PlanData
protected global::FineUI.TextBox TextPartName;
///
- /// FormRow_3 控件。
+ /// FormRow_4 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.FormRow FormRow_3;
+ protected global::FineUI.FormRow FormRow_4;
///
/// btnQuery 控件。