From 0ce538e3c3dc01153ce1bfc2d75276881206c222 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 12 十一月 2021 13:34:35 +0800
Subject: [PATCH] 产品代码上传
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 179 +++++++++++++++++++++++++++++------------------------------
1 files changed, 88 insertions(+), 91 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index ddb2b1d..fe9ab24 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -27,15 +27,13 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
-using System.Diagnostics;
using System.Linq;
-using System.Threading;
using System.Web;
using ZD.Cloud.Logger;
using ZD.Cloud.WebApi;
using ZD.Share.Common;
-namespace Demo.DynamicForm.PRD
+namespace Demo.BillView.PRD
{
[Description("鐢熶骇璁″垝骞冲彴鎸夐挳鍔熻兘")]
[HotUpdate]
@@ -87,7 +85,7 @@
base.BarItemClick(e);
try
{
- LogHelper.Info("鐢熶骇璁″垝骞冲彴鎸夐挳:" + e.BarItemKey.ToUpper().ToString());
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴鎸夐挳:" + e.BarItemKey.ToUpper().ToString());
if (e.BarItemKey.ToUpper() == "BTEXPORT")
{
ExportExcel();
@@ -145,7 +143,7 @@
return;
try
{
- DayPlanPPBomBillBatch();
+ DayPlanPPBomBillBatch1();
Extraction();
}
catch (Exception ex)
@@ -207,11 +205,11 @@
sqlList.Add(sql);
string columnName = DBServiceHelper.ExecuteScalar<string>(Context, "/*dialect*/ select stuff((select ',' + name from syscolumns Where id = object_Id('Sc_WorkBillMainXnqt') for xml path('')),1,1,'') as name ", "");
sql = $"insert into Sc_WorkBillMainXnqt({columnName}) select {columnName} from Sc_WorkBillSortBillMain";
- LogHelper.Info("娴嬭瘯1锛�" + sql);
+ //LogHelper.Info("娴嬭瘯1锛�" + sql);
sqlList.Add(sql);
columnName = DBServiceHelper.ExecuteScalar<string>(Context, "/*dialect*/ select stuff((select ',' + name from syscolumns Where id = object_Id('Sc_WorkBillSubXnqt') for xml path('')),1,1,'') as name ", "");
sql = $"insert into Sc_WorkBillSubXnqt({columnName}) select {columnName} from Sc_WorkBillSortBillSub";
- LogHelper.Info("娴嬭瘯1锛�" + sql);
+ //LogHelper.Info("娴嬭瘯1锛�" + sql);
sqlList.Add(sql);
sql = $"update Sc_WorkBillSubXnqt set FComplete=''";
@@ -233,7 +231,7 @@
/// <param name="e"></param>
public override void EntityRowDoubleClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.EntityRowClickEventArgs e)
{
- LogHelper.Info("[琛屽弻鍑讳簨浠禲");
+ //LogHelper.Info("[琛屽弻鍑讳簨浠禲");
base.EntityRowClick(e);
DynamicFormShowParameter formPa = new DynamicFormShowParameter();
@@ -501,7 +499,7 @@
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
if (saveIsSuc != "TRUE")
{
- LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
+ //LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
}
@@ -625,7 +623,7 @@
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
if (saveIsSuc != "TRUE")
{
- LogHelper.Error("鐢熶骇璁″垝骞冲彴鏂板淇濆瓨澶辫触:" + saveObj.ToString());
+ //LogHelper.Error("鐢熶骇璁″垝骞冲彴鏂板淇濆瓨澶辫触:" + saveObj.ToString());
this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
if (saveIsSuc == "TRUE")
@@ -743,12 +741,12 @@
public void CompleteSetAnalysisBatch()
{
- LogHelper.Info("榻愬鍒嗘瀽鎵归噺寮�濮嬪噯澶囨暟鎹細");
+ //LogHelper.Info("榻愬鍒嗘瀽鎵归噺寮�濮嬪噯澶囨暟鎹細");
try
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
- LogHelper.Info("榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
+ ////LogHelper.Info("榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
//娓呯┖榻愬涓存椂琛�
DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBill ");
//鏇存柊鐘舵��
@@ -921,7 +919,7 @@
i++;
}
- LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ ////LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
i = 1;
@@ -955,7 +953,7 @@
Fentity.Add(FBatchModel);
if ((i >= 20 || i == completeAnalysisTempModel.Count) && (i % 20 == 0 || i == completeAnalysisTempModel.Count))
{
- LogHelper.Info("榻愬鍒嗘瀽鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + i);
+ //LogHelper.Info("榻愬鍒嗘瀽鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + i);
JObject jsonRoot = new JObject()
{
["Creator"] = "",
@@ -972,7 +970,7 @@
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
if (saveIsSuc != "TRUE")
{
- LogHelper.Error(jsonRoot.ToString());
+ //LogHelper.Error(jsonRoot.ToString());
}
Fentity = new JArray();
}
@@ -987,24 +985,24 @@
DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
}
catch (Exception ex)
{
- LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+ //LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
}
}
//鐢熶骇鐢ㄦ枡娓呭崟 榻愬鍒嗘瀽
public string CompleteSetAnalysisByDataTable()
{
- LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+ //LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
string sql = "";
try
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
int maxFid = DBServiceHelper.ExecuteScalar<int>(Context, "select max(FID)FID FROM JIT_MOMaterReadysBill", 0);
//娓呯┖榻愬涓存椂琛� (鍏抽棴鐨勮鍗� 浠婂ぉ涔嬪墠鐨勬暟鎹笉鍋氬垹闄�)
DBServiceHelper.Execute(Context, @"/*dialect*/
@@ -1088,10 +1086,10 @@
int i = 1;
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
- LogHelper.Info("榻愬鍒嗘瀽鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
+ ////LogHelper.Info("榻愬鍒嗘瀽鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
foreach (var item in DatePlanList)
{
- //LogHelper.Info("榻愬鍒嗘瀽绗竴涓惊鐜� 锛� 宸ュ崟鍙� 锛�" + item.FPRDMOENTYID.ToString() + item.FHMASTERDATE.ToString("yyyy-MM-dd"));
+ ////LogHelper.Info("榻愬鍒嗘瀽绗竴涓惊鐜� 锛� 宸ュ崟鍙� 锛�" + item.FPRDMOENTYID.ToString() + item.FHMASTERDATE.ToString("yyyy-MM-dd"));
//绛涢�夊嚭褰撴棩璁″垝鏁版嵁
var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
foreach (var _item in _BomList)
@@ -1190,7 +1188,7 @@
i++;
}
- LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ ////LogHelper.Info($"榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
List<string> sqlList = new List<string>();
DataTable insertDT = new DataTable();
insertDT.TableName = "JIT_MOMaterReadysBill";
@@ -1262,13 +1260,13 @@
DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
return "鎿嶄綔鎴愬姛";
}
catch (Exception ex)
{
- LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+ //LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
}
@@ -1276,12 +1274,12 @@
//鐗╂枡鐢ㄦ枡娓呭崟 榻愬鍒嗘瀽
public string CompleteSetAnalysisByDataTableBom()
{
- LogHelper.Info("榻愬鍒嗘瀽(bom)sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+ //LogHelper.Info("榻愬鍒嗘瀽(bom)sql妯″紡寮�濮嬪噯澶囨暟鎹細");
string sql = "";
try
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
int maxFid = DBServiceHelper.ExecuteScalar<int>(Context, "select max(FID)FID FROM JIT_MOMaterReadysBomBill", 0);
//娓呯┖榻愬涓存椂琛�
DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBomBill ");
@@ -1355,7 +1353,7 @@
int i = 1;
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
- LogHelper.Info("榻愬鍒嗘瀽(bom)鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
+ ////LogHelper.Info("榻愬鍒嗘瀽(bom)鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
foreach (var item in DatePlanList)
{
//绛涢�夊嚭褰撴棩璁″垝鏁版嵁
@@ -1456,7 +1454,7 @@
i++;
}
- LogHelper.Info($"榻愬鍒嗘瀽(bom)锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ ////LogHelper.Info($"榻愬鍒嗘瀽(bom)锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
List<string> sqlList = new List<string>();
DataTable insertDT = new DataTable();
insertDT.TableName = "JIT_MOMaterReadysBomBill";
@@ -1528,13 +1526,13 @@
DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FCompletebom = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBomBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("榻愬鍒嗘瀽(bom)杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("榻愬鍒嗘瀽(bom)杩愯鎬绘椂闀匡細" + sw.Elapsed);
return "鎿嶄綔鎴愬姛";
}
catch (Exception ex)
{
- LogHelper.Error("榻愬鍒嗘瀽(bom)璺冲嚭锛�" + ex.Message.ToString());
+ //LogHelper.Error("榻愬鍒嗘瀽(bom)璺冲嚭锛�" + ex.Message.ToString());
return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
}
@@ -1546,13 +1544,13 @@
/// </summary>
public void Xnqt()
{
- LogHelper.Info("铏氭嫙榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+ //LogHelper.Info("铏氭嫙榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
string sql = "";
try
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
- LogHelper.Info("铏氭嫙榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
+ ////LogHelper.Info("铏氭嫙榻愬鍒嗘瀽寮�濮嬪噯澶囨暟鎹細" + sw.Elapsed);
//娓呯┖榻愬涓存椂琛�
DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBillXn ");
////鏇存柊鐘舵��
@@ -1726,7 +1724,7 @@
i++;
}
- LogHelper.Info($"铏氭嫙榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ ////LogHelper.Info($"铏氭嫙榻愬鍒嗘瀽锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
List<string> sqlList = new List<string>();
int jdtmmm = 1;
foreach (var item in completeAnalysisTempModel)
@@ -1753,13 +1751,13 @@
// DBServiceHelper.Execute(Context, @"
///*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBillXn where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
//");
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("铏氭嫙榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("铏氭嫙榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
}
catch (Exception ex)
{
this.View.ShowErrMessage("寮傚父锛�" + ex.Message.ToString());
- LogHelper.Error("铏氭嫙榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+ //LogHelper.Error("铏氭嫙榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
}
finally
{
@@ -2047,7 +2045,7 @@
{
// 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
// 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- result = this.DayPlanPPBomBillBatch();
+ result = this.DayPlanPPBomBillBatch1();
}
finally
{
@@ -2072,7 +2070,7 @@
{
try
{
- DataTable dt = DBServiceHelper.ExecuteDataSet(Context, $"select FID from Sc_DayPlanPPBomBillMain where FDOCUMENTSTATUS <>'E'").Tables[0];
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS <>'E'").Tables[0];
List<string> zxSqlList = new List<string>();
if (dt.Rows.Count > 0)
{
@@ -2091,7 +2089,7 @@
}
catch (Exception ex)
{
- LogHelper.Error(ex.Message);
+ //LogHelper.Error(ex.Message);
return "鎿嶄綔澶辫触锛岃鑱旂郴绯荤粺绠＄悊鍛�";
}
@@ -2130,10 +2128,10 @@
sqlWhere += $"AND t2.FID IN ({FDayPlanWorkID})";
}
DBServiceHelper.ExecuteBatch(Context, zxSqlList);
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
- LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹�");
+ //LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹�");
//閿佸畾鐨勬棩璁″垝涓嶇敓鎴�
try
{
@@ -2161,7 +2159,7 @@
LEFT join T_ENG_WORKCENTER t11 on t2.FHSOURCEID = t11.FID
left join T_BD_DEPARTMENT td on t3.FWORKSHOPID=td.FDEPTID
WHERE
-t1.FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{{1} - 1},getdate())
+t1.FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{0} - 1,getdate())
and t1.FEntryID not in
(
select distinct FDAYPLANFID from Sc_DayPlanPPBomBillMain where FID IN
@@ -2173,13 +2171,12 @@
select distinct FDAYPLANID from Sc_DayPlanPPBomBillSubBG
)
)
-AND {0}
+AND {1}
-- and T4.FMustQty>0
-- (
-- select FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
-- )
-",
- sqlWhere, day);
+", day, sqlWhere);
LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹畇ql:" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable dt = ds.Tables[0];
@@ -2229,7 +2226,7 @@
FMoSeq = dr["FMoSeq"].ToString(),
});
}
- LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" );
var fidList = DayPlanMaterial.Select(x => x.FEntryID).Distinct().ToList();
int i = 1;
int jdtmmm = 1;
@@ -2290,7 +2287,7 @@
Fentity.Add(model);
if ((i >= 20 || i == fidList.Count) && (i % 20 == 0 || i == fidList.Count))
{
- LogHelper.Info("鏃ヨ鍒掔敤鏂欐竻鍗曟壒閲忔墽琛岋紝璁板綍寰幆鐨勫綋鍓嶆潯鏁�" + i);
+ //LogHelper.Info("鏃ヨ鍒掔敤鏂欐竻鍗曟壒閲忔墽琛岋紝璁板綍寰幆鐨勫綋鍓嶆潯鏁�" + i);
JObject jsonRoot = new JObject()
{
["Creator"] = "",
@@ -2322,8 +2319,8 @@
}
if (saveIsSuc != "TRUE")
{
- //LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗曞垪琛ㄧ敓鎴愬け璐�:" + jsonRoot.ToString());
- LogHelper.Error(saveObj.ToString());
+ LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗曞垪琛ㄧ敓鎴愬け璐�:" + jsonRoot.ToString());
+ //LogHelper.Error(saveObj.ToString());
return "鎿嶄綔澶辫触锛�" + saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
//this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
@@ -2336,8 +2333,8 @@
jdtmmm++;
}
}
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曡繍琛屾�绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曡繍琛屾�绘椂闀匡細" + sw.Elapsed);
return "鎿嶄綔鎴愬姛";
}
catch (Exception ex)
@@ -2353,11 +2350,11 @@
/// </summary>
public void Extraction()
{
- LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]锛氭祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇�");
+ //LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]锛氭祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇�");
try
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
string sql = string.Format(@"/*dialect*/ select distinct FHICMOINTERID FID from JIT_MOMaterReadysBill ");
DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FDayPlanWorkID = "";
@@ -2372,7 +2369,7 @@
exec [鎻愭枡璁″垝棰勫鐞哴 '{0}'
", FDayPlanWorkID.Replace(",", "-"));
DBServiceHelper.Execute(Context, sql);
- LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
+ //LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
//閲囪喘璁㈠崟鏁版嵁
sql = @"
/*dialect*/
@@ -2386,7 +2383,7 @@
and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
";
List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
- LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
+ //LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
sql = string.Format(@"
/*dialect*/
SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty,FHPRDORGID FStockOrgId
@@ -2422,13 +2419,13 @@
AND T1.FID in ({0})
order by FHMASTERDATE
", FDayPlanWorkID);
- LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
+ //LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
//鐗╂枡+搴撳瓨缁勭粐鍒嗙被
var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FStockOrgId = x.Key.FStockOrgId }).ToList();
var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "163165").ToList();
- LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎬荤墿鏂欒鏁�" + MaterialIDList.Count);
+ //LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎬荤墿鏂欒鏁�" + MaterialIDList.Count);
//鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
//sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
@@ -2440,10 +2437,10 @@
List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
if (_PurchaseInventory.Count == 0)
{
- LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
+ //LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
continue;
}
- //LogHelper.Info(item.FMATERIALID.ToString());
+ ////LogHelper.Info(item.FMATERIALID.ToString());
//褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//鏈�灏忚捣璁㈤噺
@@ -2462,7 +2459,7 @@
_PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
if (_PurchaseInventory.Count == 0)
{
- //LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
+ ////LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
break;
}
@@ -2471,12 +2468,12 @@
FEntryIdList.Add(_item.FENTRYID);
NeedQty += _item.NeedQty;
- //LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
- //LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
- //LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+ ////LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
+ ////LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
+ ////LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
if (NeedQty <= FMINPOQTY)
{
- LogHelper.Info("[鎻愭枡璁″垝]褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + ",鏁伴噺锛�" + NeedQty + "锛屾渶灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+ //LogHelper.Info("[鎻愭枡璁″垝]褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + ",鏁伴噺锛�" + NeedQty + "锛屾渶灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
}
if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //璁㈠崟涓撶敤涓�х被
@@ -2486,8 +2483,8 @@
//{
foreach (var Purchase in _PurchaseInventory)
{
- //LogHelper.Info("閲囪喘璁㈠崟鍙锋祴璇曪細" + Purchase.FBillNo);
- //LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
+ ////LogHelper.Info("閲囪喘璁㈠崟鍙锋祴璇曪細" + Purchase.FBillNo);
+ ////LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
if (Purchase.FQTY >= NeedQty)
{
foreach (int id in FEntryIdList)
@@ -2538,12 +2535,12 @@
var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
//if (Qty == 0)
- // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+ // //LogHelper.Info("璁㈠崟鏁伴噺涓�0");
if (Qty > _NeedQty)
Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
//if (_NeedQty == 0)
- // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+ // //LogHelper.Info("璁㈠崟鏁伴噺涓�0");
_NeedQty = _NeedQty - Qty;
PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
@@ -2702,7 +2699,7 @@
}
var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
- LogHelper.Info($"鎻愭枡璁″垝锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{PODemandPlanTemp.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ ////LogHelper.Info($"鎻愭枡璁″垝锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{PODemandPlanTemp.Count}锛岃�楁椂锛�" + sw.Elapsed);
int tlmmm = 1;
JArray FinalyResult = new JArray();
foreach (var item in PODemandPlanList)
@@ -2745,7 +2742,7 @@
FinalyResult.Add(model);
if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
{
- LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
+ //LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
JObject jsonRoot = new JObject()
{
["Creator"] = "",
@@ -2762,19 +2759,19 @@
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
if (saveIsSuc != "TRUE")
{
- LogHelper.Error(jsonRoot.ToString());
+ //LogHelper.Error(jsonRoot.ToString());
}
FinalyResult = new JArray();
}
tlmmm++;
}
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
+ //sw.Stop();//缁撴潫璁℃椂
+ ////LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
DBServiceHelper.ExecuteBatch(Context, sqlList);
}
catch (Exception ex)
{
- LogHelper.Info("鎻愭枡璁″垝璺冲嚭锛�" + ex.Message.ToString());
+ //LogHelper.Info("鎻愭枡璁″垝璺冲嚭锛�" + ex.Message.ToString());
}
// var PODemandPlanList22 = PODemandPlanTemp.GroupBy(p => new {p.FSUPPLIERID, p.FHMASTERDATE }).ToList();
}
@@ -2942,7 +2939,7 @@
}
catch (Exception ex)
{
- LogHelper.Error(ex.Message.ToString());
+ //LogHelper.Error(ex.Message.ToString());
this.View.ShowErrMessage(ex.Message.ToString());
}
}
@@ -2981,7 +2978,7 @@
}
catch (Exception ex)
{
- LogHelper.Error(ex.Message.ToString());
+ //LogHelper.Error(ex.Message.ToString());
this.View.ShowErrMessage(ex.Message.ToString());
}
}
@@ -3008,7 +3005,7 @@
if (returnData is ListSelectedRowCollection)
{
ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
- LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
if (listSelectedRowCollection != null)
{
var ret = "";
@@ -3016,7 +3013,7 @@
{
if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
{
- LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��");
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��");
ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
continue;
}
@@ -3025,7 +3022,7 @@
int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
if (day < 0)
{
- LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:鏃ユ湡澶潬鍚庯紝" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿, " + listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= " + day.ToString());
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:鏃ユ湡澶潬鍚庯紝" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿, " + listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= " + day.ToString());
ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
continue;
}
@@ -3052,7 +3049,7 @@
}
catch (Exception ex)
{
- LogHelper.Error("閫夊崟澶辫触锛�" + ex.Message);
+ //LogHelper.Error("閫夊崟澶辫触锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.1