From 25f2835fa45e704f6eccf2feeaa3d2e95c224e2f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 09 四月 2021 17:16:04 +0800
Subject: [PATCH] 生产计划平台查询

---
 src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index d6e17d2..b9f2504 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -163,7 +163,7 @@
                             this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);
                             this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);
                             this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
-                            this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].ToString()), i);
+                            this.Model.SetValue("FDeliveryDate", dt.Rows[i][13].ToString(), i);
                             this.Model.SetValue("FOrderLevel", OrderType(dt.Rows[i][14].ToString()), i);
                             this.Model.SetValue("FOrderQuantity", FQTY, i);
                             this.Model.SetValue("FDayPlanID", fDayPlanID, i);//鏃ヨ鍒掑伐鍗旾D
@@ -301,6 +301,8 @@
                     string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
                     string FBILLNO = "";//FBILLNO 鍘熷崟鍙� 
                     string FHUnitID = "";//鍗曚綅
+                    string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+                    string FPlanEndDate = "";//缁撴潫鏃ユ湡
                     if (dt.Rows.Count > 0)
                     {
                         FID = dt.Rows[0]["FID"].ToString();
@@ -309,6 +311,8 @@
                         FQTY = dt.Rows[0]["FQTY"].ToString();
                         FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
                         FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+                        FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+                        FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
                     }
                     JObject jsonRoot = new JObject();
                     jsonRoot.Add("Creator", "");
@@ -326,6 +330,9 @@
                     jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
                     jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
                     jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
+
+                    jsonModel.Add("FHPlanBeginDate",FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+                    jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
 
                     //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
                     jsonModel.Add("FBatch", FLOT);//鎵规
@@ -518,6 +525,8 @@
                     string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
                     string FBILLNO = "";//FBILLNO 鍘熷崟鍙� 
                     string FHUnitID = "";//鍗曚綅
+                    string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+                    string FPlanEndDate = "";//缁撴潫鏃ユ湡
                     if (dt.Rows.Count > 0)
                     {
                         FID = dt.Rows[0]["FID"].ToString();
@@ -526,6 +535,8 @@
                         FQTY = dt.Rows[0]["FQTY"].ToString();
                         FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
                         FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+                        FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+                        FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
                     }
                     JObject jsonRoot = new JObject();
                     jsonRoot.Add("Creator", "");
@@ -543,7 +554,8 @@
                     jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
                     jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
                     jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
-
+                    jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+                    jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
                     //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
                     jsonModel.Add("FBatch", FLOT);//鎵规
                     jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�

--
Gitblit v1.9.1