From 33ea398cbab8ca06c953672ed2b677968bec3d5d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 29 一月 2021 11:03:03 +0800
Subject: [PATCH] 提料计划+齐套分析 写入日志
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 37b460c..6aacb61 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -55,6 +55,7 @@
base.AfterBarItemClick(e);
if (e.BarItemKey.ToUpper().Equals("TBIMPORT"))
{
+ LogService.WriteAsync("瀵煎叆鍔熻兘锛�");
ImportData();
}
@@ -67,7 +68,8 @@
//// 涓嬭浇鍦板潃
//string downloadUrl = "FileUpLoadServices/download.aspx";
//updateControl.SetCustomPropertyValue("ExDownLoadUrl", downloadUrl);
-
+ LogHelper.Info("222222");
+ LogService.WriteAsync("涓婁紶鍔熻兘锛�");
ImportDataSC(fileFullPath);
}
}
@@ -105,7 +107,7 @@
{
DataSet ds = helper.ReadFromFile(fileFullPath, 1);
DataTable dt = ds.Tables[0];
-
+ LogService.WriteAsync("瀵煎叆鍔熻兘锛歞t琛屾暟锛�" + dt.Rows.Count);
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
if (dt.Rows.Count > 0)
{
@@ -136,7 +138,7 @@
string fDayPlanBillNo = "";
sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
left join T_ENG_WORKCENTER c on a.FHSourceID=c.fid
- where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and isnull(c.FNUMBER,'') ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString());
+ where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and (isnull(c.FNUMBER,'') ='{2}' or (select count(*) from T_ENG_WORKCENTER where isnull(c.FNUMBER,'') ='{2}')=0)", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString());
DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dayPlanDt.Rows.Count > 0)
{
--
Gitblit v1.9.1