From 4fce4218a46ab38c9989aca14a359ad54749e091 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Thu, 10 Sep 2020 15:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20=E6=94=B6=E8=B4=A7=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SCP/Admin/UNIAPI.aspx | 15 +++++----
.../SCP_RECEIVE_DETAIL_VIEW.aspx | 24 +++++++-------
SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx | 32 +++++++++----------
.../WarehouseData/SCP_RECEIVE_VIEW.aspx.cs | 12 +++++--
4 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/SCP/Admin/UNIAPI.aspx b/SCP/Admin/UNIAPI.aspx
index ba98cb7..c0e292a 100644
--- a/SCP/Admin/UNIAPI.aspx
+++ b/SCP/Admin/UNIAPI.aspx
@@ -18,26 +18,29 @@
-
+
-
+
-
-
+
+
+
+
+
+
-
+
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
index 54b2158..b8ab661 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
@@ -59,21 +59,23 @@
<%----%>
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
index 85d8459..5ddee81 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
@@ -25,10 +25,6 @@
- <%-- --%>
- <%-- --%>
- <%-- --%>
- <%-- --%>
@@ -59,24 +55,26 @@
<%-- --%>
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
@@ -116,15 +114,15 @@
-
-
+
+
-
+
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
index fdfe41a..c5f199d 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
@@ -50,6 +50,7 @@ namespace SCP.WarehouseData
{
var _entity = new V_TB_RECEIVE();
_entity.RecvBillNum=txtReceiveBill.Text;//单据号
+ _entity.ErpRecvBillNum = txtErpBill.Text;//ERP单据号
if (!string.IsNullOrEmpty(ddl.SelectedValue))
{
//已收货:0,审核通过:1,已开票,2
@@ -86,11 +87,18 @@ namespace SCP.WarehouseData
}
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList;
- _entity.VendName = txtSupplier.Text;//供应商
+ _entity.VendId = txtSupplier.Text;//供应商代码
_entity.PoBillNum = txtPO.Text;//订单号
_entity.AsnBillNum = AsnBillNum.Text;//发货单号
_entity.OperName = OperName.Text;//操作员
-
+ if (txtShipTimeStar.SelectedDate != null)
+ {
+ _entity.ShipTimeStart = (DateTime)txtShipTimeStar.SelectedDate;
+ }
+ if (txtShipTimeEnd.SelectedDate != null)
+ {
+ _entity.ShipTimeEnd = (DateTime)txtShipTimeEnd.SelectedDate;
+ }
SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_GG_List(_entity, (ret) =>
{
if (ret.State == ReturnStatus.Succeed)