From 9eb450ebd526bf4701bd0ee9e9868a274e8e31e9 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 03 十一月 2022 17:28:17 +0800
Subject: [PATCH] 代码上传
---
MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 373 +++++++++++++++++++++++++++++++----------------------
1 files changed, 217 insertions(+), 156 deletions(-)
diff --git a/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index c2beba4..75007f5 100644
--- a/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/MES/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -443,20 +443,47 @@
{
try
{
- int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
- List<string> sqlList = new List<string>();
- //鏇存柊鏃ヨ鍒掓槑缁嗛攣瀹氭爣璁�
- string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
- sqlList.Add(sql);
- //鐢熸垚鎻愭枡璁″垝鍜岃鏂欒鍒�
- sql = string.Format(@"/*dialect*/
- INSERT INTO Z_SC_TLPLANZXJH (COLUMN1) VALUES ('0')
- INSERT INTO SC_TLPLANZXJH(FID,FCREATEDATE) SELECT Id,GETDATE() FROM Z_SC_TLPLANZXJH
- DELETE FROM Z_SC_TLPLANZXJH
- ");
- sqlList.Add(sql);
- DBServiceHelper.ExecuteBatch(Context, sqlList);
+ #region 鎸夊ぉ閿佸畾
+ // int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
+ // List<string> sqlList = new List<string>();
+ // //鏇存柊鏃ヨ鍒掓槑缁嗛攣瀹氭爣璁�
+ // string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
+ // sqlList.Add(sql);
+ // //鐢熸垚鎻愭枡璁″垝鍜岃鏂欒鍒�
+ // sql = string.Format(@"/*dialect*/
+ //INSERT INTO Z_SC_TLPLANZXJH (COLUMN1) VALUES ('0')
+ //INSERT INTO SC_TLPLANZXJH(FID,FCREATEDATE) SELECT Id,GETDATE() FROM Z_SC_TLPLANZXJH
+ //DELETE FROM Z_SC_TLPLANZXJH
+ //");
+ // sqlList.Add(sql);
+ // DBServiceHelper.ExecuteBatch(Context, sqlList);
+ // this.View.ShowMessage("鎿嶄綔鎴愬姛");
+ #endregion
+ #region 閫夊崟閿佸畾
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ DynamicObjectCollection filterResult = entityDataObjoct.Clone();
+ filterResult.Clear();
+ entityDataObjoct.Where(x => Convert.ToBoolean(x["FFOCUS"]) && Convert.ToInt32(x["FDayPlanWorkID"]) > 0).ToList().ForEach(x => filterResult.Add(x));
+ string FDayPlanWorkID = "";
+ if (filterResult.Count() == 0)
+ {
+ this.View.ShowMessage("璇峰嬀閫夐渶瑕侀攣瀹氱殑鏃ヨ鍒�");
+ }
+ else
+ {
+ foreach (var filter in filterResult)
+ {
+ FDayPlanWorkID += filter["FDayPlanWorkID"].ToString() + ",";
+ }
+ FDayPlanWorkID = FDayPlanWorkID.TrimEnd(',');
+ string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 where t1.FID in ({FDayPlanWorkID})";
+ DBServiceHelper.Execute(Context, sql);
+ }
this.View.ShowMessage("鎿嶄綔鎴愬姛");
+ #endregion
+
}
catch (Exception ex)
{
@@ -468,20 +495,41 @@
/// </summary>
public void RelieveLock()
{
- int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
- //鑾峰彇鍗曟嵁浣撲俊鎭�
- Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ #region 鏃ユ湡閿佸畾
+ //int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
+ ////鑾峰彇鍗曟嵁浣撲俊鎭�
+ //Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ ////鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ //DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ //List<string> sqlList = new List<string>();
+ //string sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
+ //DBServiceHelper.Execute(Context, sql);
+ //SearchList();
+ #endregion
+
+ #region 閫夊崟閿佸畾
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
- List<string> sqlList = new List<string>();
- string sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
- DBServiceHelper.Execute(Context, sql);
- //foreach (var item in entityDataObjoct)
- //{
- // sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} ";
- // sqlList.Add(sql);
- //}
- SearchList();
+ DynamicObjectCollection filterResult = entityDataObjoct.Clone();
+ filterResult.Clear();
+ entityDataObjoct.Where(x => Convert.ToBoolean(x["FFOCUS"]) && Convert.ToInt32(x["FDayPlanWorkID"]) > 0).ToList().ForEach(x => filterResult.Add(x));
+ string FDayPlanWorkID = "";
+ if (filterResult.Count() == 0)
+ {
+ this.View.ShowMessage("璇峰嬀閫夐渶瑕佽В閿佺殑鏃ヨ鍒�");
+ }
+ else
+ {
+ foreach (var filter in filterResult)
+ {
+ FDayPlanWorkID += filter["FDayPlanWorkID"].ToString() + ",";
+ }
+ FDayPlanWorkID = FDayPlanWorkID.TrimEnd(',');
+ string sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 from Sc_WorkBillSortBillSub t1 where t1.FID in ({FDayPlanWorkID})";
+ DBServiceHelper.Execute(Context, sql);
+ }
+ #endregion
this.View.ShowMessage("鎿嶄綔鎴愬姛");
}
@@ -551,7 +599,7 @@
/*dialect*/
SELECT FID FROM SC_WORKBILLSORTBILLMAIN A
WHERE FSCORDERNO = '{0}' AND FSRCBILLENTRYSEQ ='{1}' AND FHSOURCEID='{2}'"
-, Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]), Convert.ToString(current["FResourcesId_Id"]));
+ , Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]), Convert.ToString(current["FResourcesId_Id"]));
int _FDayPlanWorkID = DBServiceHelper.ExecuteScalar<int>(Context, _sql, 0);
if (_FDayPlanWorkID > 0)
{
@@ -793,16 +841,16 @@
var resuult = "";
try
{
- // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
- // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- resuult = this.CompleteSetAnalysisByDataTable();
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.CompleteSetAnalysisByDataTable();
}
finally
{
- // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
- this.View.Session["ProcessRateValue"] = 100;
- // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
- var processView = this.View.GetView(processForm.PageId);
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
if (processView != null)
{
processView.Close();
@@ -839,16 +887,16 @@
var resuult = "";
try
{
- // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
- // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- resuult = this.CompleteSetAnalysisByDataTableBom();
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.CompleteSetAnalysisByDataTableBom();
}
finally
{
- // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
- this.View.Session["ProcessRateValue"] = 100;
- // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
- var processView = this.View.GetView(processForm.PageId);
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
if (processView != null)
{
processView.Close();
@@ -933,7 +981,7 @@
");
List<PRD_WorkHouseCompar> pRD_WorkHouseCompar = ds.ToModelList<PRD_WorkHouseCompar>();
int i = 1;//鐢ㄤ簬杩涘害鏉＄殑鍔犺浇
- //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
+ //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
//鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
string LLsql = string.Format(@"
@@ -982,7 +1030,7 @@
var _pRD_WorkHouseCompar = pRD_WorkHouseCompar.Where(c => /*c.FORGID == _item.FStockOrgId &&*/ c.FWORKSHOPID == _item.FHWorkShopID).ToList();
decimal jskcQty = 0;//鐢ㄤ簬璁＄畻
decimal jskcQty2 = 0;//鐢ㄤ簬璁＄畻褰撴椂閭ｄ釜璁＄畻鑺傜偣鐨勫嵆鏃跺簱瀛�
- //璁＄畻褰撳墠杩欏嚑涓粨搴撴�荤殑搴撳瓨閲�
+ //璁＄畻褰撳墠杩欏嚑涓粨搴撴�荤殑搴撳瓨閲�
if (_pRD_WorkHouseCompar.Count > 0)
{
foreach (var _WorkHouse in _pRD_WorkHouseCompar)
@@ -1008,7 +1056,7 @@
decimal planNeed = _item.PlanCount; //涓嶅弬涓庤绠� 鐢ㄤ簬璁板綍
decimal need = _item.PlanCount;//鍙備笌璁＄畻
decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
- //鎵惧埌棰嗙敤鏁伴噺
+ //鎵惧埌棰嗙敤鏁伴噺
var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.FPRDMOENTYID && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
if (_DayPlanPickedModel.FRemainPickedQty >= need)
{
@@ -1247,7 +1295,7 @@
jdtmmm++;
}
insertDT.EndLoadData(); // 鐏屽叆鏁版嵁缁撴潫
- //鎻掑叆涔嬪墠鎵ц涓嬫竻绌鸿鍙�(娴嬭瘯鏄惁鑳藉闃叉閲嶅鐢熸垚)
+ //鎻掑叆涔嬪墠鎵ц涓嬫竻绌鸿鍙�(娴嬭瘯鏄惁鑳藉闃叉閲嶅鐢熸垚)
string deletesql = $"delete from JIT_MOMaterReadysBill where FHICMOINTERID in ({fDayPlanFids}) ";
DBServiceHelper.Execute(Context, deletesql);
DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT); // 鎵归噺鎻掑叆鍒版暟鎹簱
@@ -1533,8 +1581,8 @@
}
insertDT.EndLoadData(); // 鐏屽叆鏁版嵁缁撴潫
DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT);// 鎵归噺鎻掑叆鍒版暟鎹簱
- //DBServiceHelper.ExecuteBatch(Context, sqlList);
- //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
+ //DBServiceHelper.ExecuteBatch(Context, sqlList);
+ //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FCompletebom = '鏈綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBomBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
@@ -1651,7 +1699,7 @@
t7 on t4.F_DB = t7.FENTRYID
where t1.FDOCUMENTSTATUS not in ('E') and ta.FSTATUS in (1,2,3,4)
" + sqlwhere + " " +
-" order by FHSourceID,t1.FPRIORITY";
+ " order by FHSourceID,t1.FPRIORITY";
// sql = @"/*dialect*/
// select t2.FUnitId,
// t1.*,ta.FSTATUS,tq.FNoStockInQty,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS
@@ -1862,7 +1910,7 @@
t7 on t4.F_DB = t7.FENTRYID
where t1.FDOCUMENTSTATUS not in ('E') and ta.FSTATUS in (1,2,3,4)
" + sqlwhere + " " +
-" order by FHSourceID,t1.FPRIORITY";
+ " order by FHSourceID,t1.FPRIORITY";
// sql = @"/*dialect*/
// select
@@ -2070,7 +2118,7 @@
t7 on t4.F_DB = t7.FENTRYID
where t1.FDOCUMENTSTATUS not in ('E') and ta.FSTATUS in (1,2,3,4)
" + sqlwhere + " " +
-" order by FHSourceID,t1.FPRIORITY";
+ " order by FHSourceID,t1.FPRIORITY";
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
DateTime DateNow = DateTime.Now;//鑾峰彇褰撳墠鏃ユ湡
this.Model.DeleteEntryData("FEntity");
@@ -2430,16 +2478,16 @@
var resuult = "";
try
{
- // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
- // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- resuult = this.ExtractionTL();
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.ExtractionTL();
}
finally
{
- // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
- this.View.Session["ProcessRateValue"] = 100;
- // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
- var processView = this.View.GetView(processForm.PageId);
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
if (processView != null)
{
processView.Close();
@@ -2472,7 +2520,7 @@
LogService.Write($"鎻愭枡璁″垝閲嶇畻 杞﹂棿锛歿fProWorkShopId}锛岀粍缁囷細{fPrdOrgId}");
Stopwatch sw = new Stopwatch();
sw.Start();//寮�濮嬭鏃�
- //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 骞朵笖鏌ヨ鍑洪渶瑕佽繘琛岃繍绠楃殑鏁版嵁
+ //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 骞朵笖鏌ヨ鍑洪渶瑕佽繘琛岃繍绠楃殑鏁版嵁
string sql = string.Format($"/*dialect*/exec PROC_JIT_TLPLANYCL '{fProWorkShopId}','{fPrdOrgId}'");
List<DayPlanPpbom> DayPlanPpbom = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanPpbom>();
if (DayPlanPpbom.Count == 0)
@@ -2871,16 +2919,16 @@
var resuult = "";
try
{
- // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
- // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- resuult = this.ExtractionYL();
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.ExtractionYL();
}
finally
{
- // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
- this.View.Session["ProcessRateValue"] = 100;
- // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
- var processView = this.View.GetView(processForm.PageId);
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
if (processView != null)
{
processView.Close();
@@ -3447,34 +3495,34 @@
if (returnData is ListSelectedRowCollection)
{
ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
- //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
- if (listSelectedRowCollection != null)
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
+ if (listSelectedRowCollection != null)
{
var ret = "";
foreach (var listSelectedRow in listSelectedRowCollection)
{
- //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() + ",宸查��");
- // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
- // continue;
- //}
- //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- //if (day > 0)
- //{
- // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
- // continue;
- //}
- ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
- //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- //if (day < 0)
- //{
- // ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
- // continue;
+ //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() + ",宸查��");
+ // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
+ // continue;
+ //}
+ //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ //if (day > 0)
+ //{
+ // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
+ // continue;
+ //}
+ ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
+ //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ //if (day < 0)
+ //{
+ // ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
+ // continue;
- string sql = @"SELECT T2.FBILLNO,T2.FPRDORGID,T1.FSEQ,T1.FMATERIALID,TA.FSTATUS,T1.FUNITID,T1.FQTY,T1.FWORKSHOPID,T1.FPLANSTARTDATE,T1.FXQD
+ string sql = @"SELECT T2.FBILLNO,T2.FPRDORGID,T1.FSEQ,T1.FMATERIALID,TA.FSTATUS,T1.FUNITID,T1.FQTY,T1.FWORKSHOPID,T1.FPLANSTARTDATE,T1.FXQD
,T1.FSALEORDERNO,T3.FPLANDELIVERYDATE,T3.FQTY AS FSALEORDERQTY,TQ.FNoStockInQty FROM T_PRD_MOENTRY T1
JOIN T_PRD_MOENTRY_A TA ON T1.FENTRYID =TA.FENTRYID
JOIN T_PRD_MOENTRY_Q TQ on t1.FENTRYID = TQ.FENTRYID
@@ -3501,7 +3549,7 @@
this.View.Model.SetValue("FNoStockInQty", dt.Rows[0]["FNoStockInQty"].ToString(), Fseq);//鏈叆搴撴暟閲�
this.View.Model.SetValue("FDeliveryDate", dt.Rows[0]["FPLANDELIVERYDATE"]?.ToString(), Fseq);//浜よ揣鏃ユ湡
//this.View.Model.SetValue("FT" + day.ToString(), dt.Rows[0]["FQTY"]?.ToString(), Fseq);
- Fseq++;
+ Fseq++;
}
else
{
@@ -3525,36 +3573,36 @@
if (returnData is ListSelectedRowCollection)
{
ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
- //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
- if (listSelectedRowCollection != null)
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
+ if (listSelectedRowCollection != null)
{
var ret = "";
foreach (var listSelectedRow in listSelectedRowCollection)
{
- //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() + ",宸查��");
- // ret += "濮斿璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
- // continue;
- //}
- //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //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());
- // ret += "濮斿璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿锛�" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
- // continue;
- //}
- ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
- //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_SUB_REQORDERENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- //if (day < 0)
- //{
- // //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;
- //}
- this.Model.CreateNewEntryRow("FEntity");
+ //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() + ",宸查��");
+ // ret += "濮斿璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
+ // continue;
+ //}
+ //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //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());
+ // ret += "濮斿璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿锛�" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
+ // continue;
+ //}
+ ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
+ //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_SUB_REQORDERENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ //if (day < 0)
+ //{
+ // //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;
+ //}
+ this.Model.CreateNewEntryRow("FEntity");
this.View.Model.SetItemValueByNumber("FORGID", "100", Fseq);
this.View.Model.SetValue("FOrderType", "濮斿璁㈠崟", Fseq);
this.View.Model.SetValue("FSCOrderNo", listSelectedRow.DataRow["FBillNo"].ToString(), Fseq);
@@ -3564,9 +3612,9 @@
this.View.Model.SetValue("FOrderQuantity", listSelectedRow.DataRow["FQty"].ToString(), Fseq);
this.View.Model.SetValue("FProductWorkShopId", 0, Fseq);
this.View.Model.SetValue("FOrderLevel", "3", Fseq);
- //this.View.Model.SetValue("FBzDate", DateTime.Now.AddDays(day).ToShortDateString(), Fseq);//棰勮寮�宸ユ棩鏈�
- //this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
- Fseq++;
+ //this.View.Model.SetValue("FBzDate", DateTime.Now.AddDays(day).ToShortDateString(), Fseq);//棰勮寮�宸ユ棩鏈�
+ //this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
+ Fseq++;
}
if (ret != "")
{
@@ -3589,34 +3637,34 @@
if (returnData is ListSelectedRowCollection)
{
ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
- //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
- if (listSelectedRowCollection != null)
+ //LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
+ if (listSelectedRowCollection != null)
{
var ret = "";
foreach (var listSelectedRow in listSelectedRowCollection)
{
- //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() + ",宸查��");
- // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
- // continue;
- //}
- //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- //if (day > 0)
- //{
- // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
- // continue;
- //}
- ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
- //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- //if (day < 0)
- //{
- // ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
- // continue;
- //}
- string sql = @"SELECT T2.FBILLNO,T2.FPRDORGID,T1.FSEQ,T1.FMATERIALID,TA.FSTATUS,T1.FUNITID,T1.FQTY,T1.FWORKSHOPID,T1.FPLANSTARTDATE
+ //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() + ",宸查��");
+ // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
+ // continue;
+ //}
+ //string sql = $"select FID from Sc_WorkBillSortBillMain where FDOCUMENTSTATUS NOT IN ('E') and FPRDMOENTYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ //if (day > 0)
+ //{
+ // ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸插瓨鍦ㄦ棩璁″垝\n";
+ // continue;
+ //}
+ ////浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
+ //sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ //day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ //if (day < 0)
+ //{
+ // ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿:" + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
+ // continue;
+ //}
+ string sql = @"SELECT T2.FBILLNO,T2.FPRDORGID,T1.FSEQ,T1.FMATERIALID,TA.FSTATUS,T1.FUNITID,T1.FQTY,T1.FWORKSHOPID,T1.FPLANSTARTDATE
,T1.FSALEORDERNO,T3.FPLANDELIVERYDATE,T3.FQTY AS FSALEORDERQTY,TQ.FNoStockInQty FROM T_PRD_MOENTRY T1
JOIN T_PRD_MOENTRY_A TA ON T1.FENTRYID =TA.FENTRYID
JOIN T_PRD_MOENTRY_Q TQ on t1.FENTRYID = TQ.FENTRYID
@@ -3643,7 +3691,7 @@
this.View.Model.SetValue("FNoStockInQty", dt.Rows[0]["FNoStockInQty"].ToString(), Fseq);//鏈叆搴撴暟閲�
this.View.Model.SetValue("FDeliveryDate", dt.Rows[0]["FPLANDELIVERYDATE"]?.ToString(), Fseq);//浜よ揣鏃ユ湡
//this.View.Model.SetValue("FT" + day.ToString(), dt.Rows[0]["FQTY"]?.ToString(), Fseq);
- Fseq++;
+ Fseq++;
}
else
{
@@ -3788,16 +3836,16 @@
var resuult = "";
try
{
- // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
- // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- resuult = this.btnReFarsh();
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.btnReFarsh();
}
finally
{
- // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
- this.View.Session["ProcessRateValue"] = 100;
- // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
- var processView = this.View.GetView(processForm.PageId);
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
if (processView != null)
{
processView.Close();
@@ -3927,7 +3975,7 @@
var _pRD_WorkHouseCompar = pRD_WorkHouseCompar.Where(c => /*c.FORGID == _item.FStockOrgId &&*/ c.FWORKSHOPID == _item.FHWorkShopID).ToList();
decimal jskcQty = 0;//鐢ㄤ簬璁＄畻
decimal jskcQty2 = 0;//鐢ㄤ簬璁＄畻褰撴椂閭ｄ釜璁＄畻鑺傜偣鐨勫嵆鏃跺簱瀛�
- //璁＄畻褰撳墠杩欏嚑涓粨搴撴�荤殑搴撳瓨閲�
+ //璁＄畻褰撳墠杩欏嚑涓粨搴撴�荤殑搴撳瓨閲�
if (_pRD_WorkHouseCompar.Count > 0)
{
foreach (var _WorkHouse in _pRD_WorkHouseCompar)
@@ -3953,7 +4001,7 @@
decimal planNeed = _item.PlanCount; //涓嶅弬涓庤绠� 鐢ㄤ簬璁板綍
decimal need = _item.PlanCount;//鍙備笌璁＄畻
decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
- //鎵惧埌棰嗙敤鏁伴噺
+ //鎵惧埌棰嗙敤鏁伴噺
var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.FPRDMOENTYID && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
if (_DayPlanPickedModel.FRemainPickedQty >= need)
{
@@ -4193,7 +4241,7 @@
jdtmmm++;
}
insertDT.EndLoadData(); // 鐏屽叆鏁版嵁缁撴潫
- //鎻掑叆涔嬪墠鎵ц涓嬫竻绌鸿鍙�(娴嬭瘯鏄惁鑳藉闃叉閲嶅鐢熸垚)
+ //鎻掑叆涔嬪墠鎵ц涓嬫竻绌鸿鍙�(娴嬭瘯鏄惁鑳藉闃叉閲嶅鐢熸垚)
string deletesql = $"delete from JIT_MOMaterReadysBill where FHICMOINTERID in ({fDayPlanFids}) ";
LogService.Write("鍒锋柊鎸夐挳 榻愬鍒嗘瀽鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed); // 鎵归噺鎻掑叆鍒版暟鎹簱
DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT);
@@ -4900,7 +4948,7 @@
}
int fLockDays = Convert.ToInt32(this.Model.GetValue("FLockDays"));//寮曞叆澶╂暟
string sql = $"/*dialect*/ exec proc_jit_zdpc {fPrdOrgId},{fProWorkShopId},{fLockDays}";
- LogService.Write("鑷姩鎺掍骇sql锛�"+sql);
+ LogService.Write("鑷姩鎺掍骇sql锛�" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
if (ds.Tables[0].Rows[0][0].ToString().Contains("澶辫触_鐢熶骇璁㈠崟娌℃湁缁存姢鐢熶骇璧勬簮"))
{
@@ -4930,20 +4978,32 @@
}
}
DataTable dt = ds.Tables[0];//鐢熶骇璁㈠崟淇℃伅缁撴灉闆�
+ if (dt == null || dt.Rows.Count == 0)
+ {
+ errMessege += $"鎿嶄綔澶辫触锛屾湭鍖归厤鍒伴渶瑕佹帓浜х殑鐢熶骇璁㈠崟\r\n";
+ this.View.ShowErrMessage("鎿嶄綔澶辫触锛屾病鏈夌淮鎶や骇鑳絓r\n" + errMessege);
+ return;
+ }
List<string> fsczyidList = dt.AsEnumerable().Select(r => r["FSCZYID"].ToString()).Distinct().ToList();//鐢熶骇璧勬簮闆嗗悎
foreach (var item in fsczyidList)//寰幆鐢熶骇璧勬簮
{
DataRow[] drs = dt.Select("FSCZYID =" + item);//绛涢�夊嚭褰撳墠鐢熶骇璧勬簮鐢熶骇璁㈠崟鏁版嵁
string _sql = string.Format(@"
/*dialect*/
-select FCalUserId,FCalUserType,FShiftId,FIsWorkTime,FDay,FDateStyle,c.FALLHOURS ,c.FALLHOURS FALLHOURSCONST,b.FENTRYID from T_ENG_WORKCAL a
+select FCalUserId,FCalUserType,FShiftId,FIsWorkTime,FDay,FDateStyle,(c.FALLHOURS-isnull(tt.FHOURS,0)) as FALLHOURS,(c.FALLHOURS-isnull(tt.FHOURS,0)) FALLHOURSCONST,b.FENTRYID from T_ENG_WORKCAL a
left join T_ENG_WORKCALFULLDATA b on a.FID=b.FID
left join T_ENG_SHIFT c on b.FShiftId =c.FID --鐝埗琛�
+left join
+(
+select sum(FHOURS)FHOURS ,FGZRLENTRYID from Sc_WorkBillSortBillSub
+where FGZRLENTRYID >0 and FHLockedSub = 1
+group by FGZRLENTRYID
+) tt on b.FENTRYID = tt.FGZRLENTRYID
where FCalUserType ='ENG_RepetitiveProductLine'
and FDateStyle = 1 --鏄惁宸ヤ綔鏃�
and FIsWorkTime = 1 --鏄惁鐢熶骇
and DATEDIFF(D,getdate(),FDAY)>=0
-and c.FALLHOURS >0
+and (c.FALLHOURS-isnull(tt.FHOURS,0)) >0
and FCalUserId = {0}", item);
LogService.Write("浜ц兘sql锛�" + _sql);
var engWorkcalfulldataList = DBServiceHelper.ExecuteDataSet(Context, _sql).ToModelList<ENG_WORKCALFULLDATA>();//鎵�鏈夊彲浠ョ敤浜庢帓浜х殑鏃ユ湡
@@ -5047,7 +5107,8 @@
{
this.View.ShowMessage(errMessege);
}
- else {
+ else
+ {
this.View.ShowMessage("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.1