From d6348fefb6db1697ef51ea05a98a91dbece2ba36 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 19 二月 2021 13:54:19 +0800
Subject: [PATCH] 标准bom齐套分析
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs | 2
2 files changed, 324 insertions(+), 1 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 4cf0488..4e9af73 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -108,6 +108,11 @@
{
COMPLETE();
}
+ //榻愬鍒嗘瀽
+ if (e.BarItemKey.ToUpper() == "TBCOMPLETEBOM")
+ {
+ COMPLETEBOM();
+ }
//tbXnqt铏氭嫙榻愬
if (e.BarItemKey.ToUpper() == "TBXNQT")
{
@@ -239,6 +244,9 @@
}
else
{
+ var type = this.View.Model.GetValue("FQTTYPE");
+ if(type =="鏍囧噯Bom")
+ formPa.CustomParams.Add("tempName", "JIT_MOMaterReadysBomBill");
//榻愬鍒嗘瀽鏄庣粏鍒楄〃璺宠浆
formPa.FormId = "paez_CompleteAnalysisDetail";
formPa.CustomParams.Add("FHICMOInterID", Convert.ToString(this.View.Model.GetValue("FDayPlanWorkID", e.Row).ToString()));
@@ -655,6 +663,53 @@
},
(t) => { });
}
+ private void COMPLETEBOM()
+ {
+ // 鏄剧ず涓�涓繘搴︽樉绀虹晫闈細鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害
+ // bUseTruePro鍙傛暟锛氭槸鍚︽樉绀虹湡瀹炵殑杩涘害銆�
+ // bUseTruePro = false 锛�
+ // 鏄剧ず涓�涓笉鍋滄粴鍔ㄧ殑妯℃嫙杩涘害锛屼笌瀹為檯澶勭悊杩涘害娌℃湁鍏宠仈銆�
+ // 姝ゆ柟妗堜紭鐐癸細瀹為檯澶勭悊浠ｇ爜鏃犻渶璁＄畻杩涘害
+ // 姝ゆ柟妗堢己鐐癸細杩涘害涓嶅噯纭紝涓旇繘搴﹂〉闈笉浼氳嚜鍔ㄥ叧闂��
+ // bUseTruePro = true: 杩涘害鐣岄潰鏄剧ず鐪熷疄杩涘害
+ // 姝ゆ柟妗堜紭鐐癸細杩涘害鐪熷疄
+ // 姝ゆ柟妗堢己鐐癸細闇�瑕佸湪澶勭悊浠ｇ爜涓紝涓嶆柇鐨勬洿鏂扮湡瀹炶繘搴︼紝鏇存柊璇彞
+ // this.View.Session["ProcessRateValue"] = 100;
+ // 鐗瑰埆璇存槑锛屽綋杩涘害鏇存柊鍒�100鏃讹紝杩涘害鐣岄潰浼氳嚜鍔ㄥ叧闂�
+ // 鏈渚嬮�夌敤姝ゆ柟妗�
+ var processForm = this.View.ShowProcessForm(
+ new Action<FormResult>(t => { }),
+ true,
+ "姝ｅ湪鐢熸垚锛岃绋嶅��...");
+
+ // 寮�鍚竴涓紓姝ョ嚎绋嬶紝澶勭悊寮曞叆鍔熻兘
+ // using Kingdee.BOS.KDThread;
+ MainWorker.QuequeTask(() =>
+ {
+ var resuult = "";
+ try
+ {
+ // 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
+ // 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
+ resuult = this.CompleteSetAnalysisByDataTableBom();
+ }
+ finally
+ {
+ // 纭繚鏍囪杩涘害宸茬粡鍒拌揪100%
+ this.View.Session["ProcessRateValue"] = 100;
+ // 寮曞叆瀹屾瘯锛屽叧闂繘搴︽樉绀洪〉闈�
+ var processView = this.View.GetView(processForm.PageId);
+ if (processView != null)
+ {
+ processView.Close();
+ this.View.SendDynamicFormAction(processView);
+ this.View.ShowMessage(resuult);
+ }
+ }
+ },
+ (t) => { });
+ }
+
/// <summary>
/// 榻愬鍒嗘瀽
/// </summary>
@@ -1373,6 +1428,7 @@
}
}
+ //鐢熶骇鐢ㄦ枡娓呭崟 榻愬鍒嗘瀽
public string CompleteSetAnalysisByDataTable()
{
LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
@@ -1611,6 +1667,7 @@
dr["FCOMPLETECOUNT1"] = item.FCompleteCount1;
dr["FERPCLSID"] = item.FErpClsID;
insertDT.Rows.Add(dr);
+ //Thread.Sleep(6000);
this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(80) / completeAnalysisTempModel.Count) * jdtmmm);
jdtmmm++;
}
@@ -1636,6 +1693,272 @@
}
}
+ //鐗╂枡鐢ㄦ枡娓呭崟 榻愬鍒嗘瀽
+ public string CompleteSetAnalysisByDataTableBom()
+ {
+ LogHelper.Info("榻愬鍒嗘瀽(bom)sql妯″紡寮�濮嬪噯澶囨暟鎹細");
+ string sql = "";
+ try
+ {
+ 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 ");
+ //鏇存柊鐘舵��
+ DBServiceHelper.Execute(Context, "/*dialect*/ update Sc_WorkBillSortBillsub set FCOMPLETEBOM='' ");
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @"
+/*dialect*/
+ select isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0) FBASEQTY,T1.FStockOrgId,T1.FMATERIALID,a.FOWNERID,c.FNUMBER from
+(
+select a.FHPRDORGID FStockOrgId,T2.FMATERIALID from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN(select FID,FMATERIALID from T_PRD_PPBOMENTRY
+group by FMATERIALID,FID) T2 on T1.FID = t2.FID
+group by a.FHPRDORGID,T2.FMATERIALID
+) T1
+LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
+LEFT JOIN JIT_MOMaterReadysBomBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId
+LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
+--where T1.FMATERIALID in (105773)
+");
+ ListInventory = ds.ToModelList<PRD_Inventory>();
+ //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
+ ds = DBServiceHelper.ExecuteDataSet(Context, @"
+/*dialect*/
+ select sum(isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0))FBASEQTY,T1.FStockOrgId,T1.FMATERIALID from
+(
+select a.FHPRDORGID FStockOrgId,T2.FMATERIALID from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN(select FID,FMATERIALID from T_PRD_PPBOMENTRY
+group by FMATERIALID,FID) T2 on T1.FID = t2.FID
+group by a.FHPRDORGID,T2.FMATERIALID
+) T1
+LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
+LEFT JOIN JIT_MOMaterReadysBomBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID
+join t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+where d.FAvailableComplete<>0
+--where T1.FMATERIALID in (105773)
+group by T1.FStockOrgId,T1.FMATERIALID
+");
+ ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
+ //闇�瑕侀綈濂楀垎鏋�(bom)鐨勬暟鎹�
+ sql = @"
+ /*dialect*/
+select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE, a.FSCORDERNO as FMOBillNO,
+T2.FMATERIALID FMATERIALID2, T4.FNumber,t2.FNUMERATOR/t2.FDENOMINATOR dwyl,(FHQTY-ISNULL(FProductNum,0))*(t2.FNUMERATOR/t2.FDENOMINATOR ) PlanCount,TBase.FErpClsID
+from SC_WORKBILLSORTBILLMAIN a
+join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
+--join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN T_ENG_BOMCHILD T2 on a.FBOMID = t2.FID
+ --LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
+JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
+JOIN t_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
+JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
+--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
+where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
+ORDER BY b.FHMASTERDATE,a.FHOrderLev
+";
+ ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+ List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
+ //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜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();
+ //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
+ List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
+ int i = 1;
+ //鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
+ Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
+ LogHelper.Info("榻愬鍒嗘瀽(bom)鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
+ foreach (var item in DatePlanList)
+ {
+ //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
+ var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
+ foreach (var _item in _BomList)
+ {
+ //璇ユ棩璁″垝鐗╂枡闇�瑕佹暟
+ decimal need = _item.PlanCount;
+ var sjkcList = ListInventoryByStockOrgId.Where(x => x.FMATERIALID == _item.FMATERIALID2 && x.FStockOrgId == _item.FStockOrgId).FirstOrDefault();
+ //鐪熸闇�瑕佸彇璁＄畻鐨勬暟閲忥紙鎷嗗垎璐т富锛�
+ //璐т富鍖归厤
+ List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == _item.FMATERIALID2 && c.FStockOrgId == _item.FStockOrgId && c.FBASEQTY > 0).ToList();
+ if (_ListInventory.Count > 0)
+ {
+ decimal _fLackCount = _item.PlanCount > sjkcList.FBASEQTY ? (_item.PlanCount - sjkcList.FBASEQTY) : 0;//缂烘枡鏁伴噺
+ foreach (var Inventory in _ListInventory)
+ {
+ if (need == 0)
+ break;
+ decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//榻愬鏁伴噺
+ decimal occupyMaterial = 0;
+ if (!occupyDic.ContainsKey(_item.FMATERIALID2))
+ {
+ occupyDic.Add(_item.FMATERIALID2, fCompleteCount);
+ }
+ else
+ {
+ occupyMaterial = occupyDic[_item.FMATERIALID2];
+ occupyDic[_item.FMATERIALID2] = occupyMaterial + fCompleteCount;
+ }
+ completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.FPRDMOMAINID,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FErpClsID = _item.FErpClsID,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "BD_OwnerOrg",
+ FOwnerId = Inventory.FOwnerId,
+ FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FCompleteCount1 = fCompleteCount, //榻愬鏁伴噺
+ FLackCount = _fLackCount,//缂烘枡鏁伴噺
+ FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
+ FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ /* 2021 1.26 鏇存敼涓簄eed
+ FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
+ */
+ FComPlete = sjkcList.FBASEQTY >= need ? "榻愬" : "鏈綈濂�",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+ //鎵ｅ噺鎬诲簱瀛樻暟閲�
+ sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
+ //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+ need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ //鎵ｅ噺娑堣�楀簱瀛�
+ Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+ }
+ }
+ else
+ {
+ decimal occupyMaterial = 0;
+ if (occupyDic.ContainsKey(_item.FMATERIALID2))
+ {
+ occupyMaterial = occupyDic[_item.FMATERIALID2];
+ }
+ completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
+ {
+ FHMainICMOInterIDr = _item.FPRDMOMAINID,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
+ FHStockOrgID = _item.FStockOrgId,
+ FHPRDORGID = _item.FStockOrgId,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "BD_OwnerOrg",
+ FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FCompleteCount1 = 0, //榻愬鏁伴噺
+ FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
+ FHStockQty = 0,//鍗虫椂搴撳瓨
+ FHLeftQty = 0,//鍙敤鏁伴噺
+ FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FComPlete = "鏈綈濂�",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+ }
+ }
+ //Thread.Sleep(100);
+ // this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(40) / DatePlanList.Count) * i);
+ i++;
+
+ }
+ LogHelper.Info($"榻愬鍒嗘瀽(bom)锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋锛屾�昏鏁帮細{completeAnalysisTempModel.Count}锛岃�楁椂锛�" + sw.Elapsed);
+ List<string> sqlList = new List<string>();
+ DataTable insertDT = new DataTable();
+ insertDT.TableName = "JIT_MOMaterReadysBomBill";
+ insertDT.Columns.Add("FID", typeof(long));
+ //insertDT.Columns.Add("FBILLNO", typeof(string));
+ insertDT.Columns.Add("FDOCUMENTSTATUS", typeof(string));
+ insertDT.Columns.Add("FHMAINICMOINTERIDR", typeof(long));
+ insertDT.Columns.Add("FHMAINICMOENTRYID", typeof(long));
+ insertDT.Columns.Add("FHICMOINTERID", typeof(long));
+ insertDT.Columns.Add("FHICMOENTRYID", typeof(long));
+ insertDT.Columns.Add("FHMATERID", typeof(long));
+ insertDT.Columns.Add("FHSTOCKORGID", typeof(long));
+ insertDT.Columns.Add("FHSTOCKQTY", typeof(decimal));
+ insertDT.Columns.Add("FHLEFTQTY", typeof(decimal));
+ insertDT.Columns.Add("FHPRDORGID", typeof(long));
+ insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
+ insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FPRDBILLNO", typeof(string));
+ insertDT.Columns.Add("FOWNERID", typeof(long));
+ insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
+ //insertDT.Columns.Add("FIDENTIFICAT", typeof(long));
+ insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
+ insertDT.Columns.Add("FCOMPLETE", typeof(string));
+ insertDT.Columns.Add("FLACKCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FOCCUPYCOUNT", typeof(decimal));
+ insertDT.Columns.Add("FCOMPLETECOUNT1", typeof(decimal));
+ insertDT.Columns.Add("FERPCLSID", typeof(string));
+ int jdtmmm = 1;
+ foreach (var item in completeAnalysisTempModel)
+ {
+ DataRow dr = insertDT.NewRow();
+ dr["FID"] = maxFid + jdtmmm;
+ //dr["FBILLNO"] = "";
+ dr["FDOCUMENTSTATUS"] = "A";
+ dr["FHMAINICMOINTERIDR"] = item.FHMainICMOInterIDr;
+ dr["FHMAINICMOENTRYID"] = item.FHMainICMOEntryID;
+ dr["FHICMOINTERID"] = item.FHICMOInterID;
+ dr["FHICMOENTRYID"] = item.FHICMOEntryID;
+ dr["FHMATERID"] = item.FHMaterID;
+ dr["FHSTOCKORGID"] = item.FHStockOrgID;
+ dr["FHSTOCKQTY"] = item.FHStockQty;
+ dr["FHLEFTQTY"] = item.FHLeftQty;
+ dr["FHPRDORGID"] = item.FHPRDORGID;
+ dr["FUNITDOSAGE"] = item.FUnitDosage;
+ dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
+ dr["FPRDBILLNO"] = item.FPRDBillNo;
+ dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
+ dr["FOWNERTYPEID"] = "BD_OwnerOrg";
+ //dr["FIDENTIFICAT"] = "";
+ dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
+ dr["FCOMPLETE"] = item.FComPlete;
+ dr["FLACKCOUNT"] = item.FLackCount;
+ dr["FOCCUPYCOUNT"] = item.FOccupyCount;
+ dr["FCOMPLETECOUNT1"] = item.FCompleteCount1;
+ dr["FERPCLSID"] = item.FErpClsID;
+ insertDT.Rows.Add(dr);
+ //Thread.Sleep(6000);
+ this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(80) / completeAnalysisTempModel.Count) * jdtmmm);
+ jdtmmm++;
+ }
+ insertDT.EndLoadData(); // 鐏屽叆鏁版嵁缁撴潫
+ // 鎵归噺鎻掑叆鍒版暟鎹簱
+ DBServiceHelper.BulkInserts(this.Context, string.Empty, string.Empty, insertDT);
+ //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,'鏈綈濂�') ='鏈綈濂�')
+");
+ 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);
+ return "鎿嶄綔鎴愬姛";
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("榻愬鍒嗘瀽(bom)璺冲嚭锛�" + ex.Message.ToString());
+ return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
+
+ }
+ }
+
/// <summary>
/// 铏氭嫙榻愬
diff --git a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
index 557ab29..1ad007e 100644
--- a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
+++ b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
@@ -504,7 +504,7 @@
public void Jscn()
{
//鏌ヨ鍑洪噸澶嶇敓浜х嚎瀵瑰簲鐨勫伐浣滄棩鍘嗕俊鎭�
- string _sql = @"
+ string _sql = @"/*dialect*/
select FCalUserId,FCalUserType,FShiftId,FIsWorkTime,FDay,FDateStyle,c.FALLHOURS ,c.FALLHOURS 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
--
Gitblit v1.9.1