From 3b819605e47e354eeafc696ea3bcb837b8eb063f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期日, 28 二月 2021 13:59:37 +0800
Subject: [PATCH] 2.28 客户现场调整后上传
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index c41185e..a80e1b2 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -68,7 +68,6 @@
//// 涓嬭浇鍦板潃
//string downloadUrl = "FileUpLoadServices/download.aspx";
//updateControl.SetCustomPropertyValue("ExDownLoadUrl", downloadUrl);
- LogHelper.Info("222222");
LogService.WriteAsync("涓婁紶鍔熻兘锛�");
ImportDataSC(fileFullPath);
}
@@ -120,7 +119,7 @@
if (dt.Rows[i][1].ToString() == "")
error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;";
if (dt.Rows[i][2].ToString() == "")
- error += "鐢熶骇缁勭粐涓嶈兘涓虹┖;";
+ error += "缁勭粐涓嶈兘涓虹┖;";
if (dt.Rows[i][3].ToString() == "")
error += "鐢熶骇杞﹂棿涓嶈兘涓虹┖;";
if (dt.Rows[i][5].ToString() == "")
@@ -145,7 +144,7 @@
string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID
-WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}'", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString());
+WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString());
DataTable _dt = new DataTable();
_dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FLOT = "";//FLOT 鎵规
@@ -174,7 +173,7 @@
this.Model.SetValue("FSEQ", i + 1, i);
this.Model.SetValue("FSalOrderNo", dt.Rows[i][0].ToString(), i);
this.Model.SetValue("FSCOrderNo", dt.Rows[i][1].ToString(), i);
- this.Model.SetItemValueByNumber("FORGID", dt.Rows[i][2].ToString(), i);
+ this.Model.SetItemValueByNumber("FORGID", "100", i);
this.Model.SetItemValueByNumber("FProductWorkShopId", dt.Rows[i][3].ToString(), i);
this.Model.SetItemValueByNumber("FResourcesId", dt.Rows[i][4].ToString(), i);
// this.Model.SetValue("FMatrailId", dt.Rows[i][5].ToString(), i);
@@ -334,20 +333,20 @@
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
- jsonModel.Add("FSCOrderNo", current["FSCOrderNo"].ToString()); //鐢熶骇璁㈠崟鍙稦SCOrderNo
+ jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
jsonModel.Add("FHOrderLev", current["FOrderLevel"].ToString());//璁㈠崟绛夌骇
jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
- jsonModel.Add("FHOrderCommitDate", current["FDeliveryDate"].ToString());//浜よ揣鏈烪OrderCommitDate
+ jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
//jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
- jsonModel.Add("FOrderQuantity", current["FOrderQuantity"].ToString()); ;//鐢熶骇璁㈠崟鏁伴噺
- jsonModel.Add("FDayPlanQuantity", current["FDayPlanQuantity"].ToString()); ;//鏃ヨ鍒掓暟閲�
- jsonModel.Add("FNoScheduled", current["FNoScheduled"].ToString()); ;//鏈帓鏁伴噺
+ jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
+ jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
+ jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
JObject jsonFHMaterID = new JObject();
jsonFHMaterID.Add("FNumber", (current["FMatrailId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHMaterID", jsonFHMaterID);//FHMaterID 鐗╂枡
@@ -377,6 +376,8 @@
DateTime EndDate = DBServiceHelper.ExecuteScalar<DateTime>(Context, sql, DateTime.Now);
for (int i = 0; i <= 60; i++)
{
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
if (EndDate >= date.AddDays(i))
continue;
JObject jsonFPOOrderEntry = new JObject();
@@ -400,7 +401,6 @@
}
else
{
- LogService.WriteAsync(jsonRoot);
LogHelper.Error(jsonRoot.ToString());
this.View.ShowErrMessage(jsonRoot.ToString());
}
@@ -409,6 +409,15 @@
{
for (int i = 0; i <= 60; i++)
{
+ LogHelper.Error("娴嬭瘯璺冲嚭");
+
+
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
+
+ LogHelper.Error("娴嬭瘯璺冲嚭缁撴潫");
+
+
JObject jsonFPOOrderEntry = new JObject();
jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
@@ -431,7 +440,6 @@
}
else
{
- LogService.WriteAsync(jsonRoot);
LogHelper.Error(jsonRoot.ToString());
this.View.ShowErrMessage(jsonRoot.ToString());
}
@@ -441,6 +449,7 @@
}
catch (Exception ex)
{
+ LogHelper.Error(ex.ToString());
this.View.ShowErrMessage(ex.ToString());
}
--
Gitblit v1.9.1