From 2fd0e1116c1a99af7555d91728d1adc36f753464 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 七月 2023 17:26:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 70089ce..3e81c3e 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -42,7 +42,8 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
- $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
+ $",'{omdelMian.HMastersDate}','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -286,6 +287,7 @@
{
SumCount += 1;
////淇濆瓨瀛愯〃
+
objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
, HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
, DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
@@ -776,8 +778,11 @@
//鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
+ LogService.Write("LLsql:" + LLsql);
ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
+ LogService.Write(JsonConvert.SerializeObject(ds));
DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
+ LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
//CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
@@ -786,8 +791,11 @@
LogService.Write($"榻愬鍒嗘瀽锛屾暟鎹噯澶囬樁娈碉紝鐢ㄦ椂" + sw.Elapsed + "鎬婚渶瑕佸惊鐜殑bom鏁伴噺锛�" + DatePlanList.Count);
//绗竴涓惊鐜� 鏃ヨ鍒掑伐鍗曟槑缁� 涓�澶�+涓�涓伐鍗� 涓�涓惊鐜�
+ int o = 0;
foreach (var item in DatePlanList)
{
+ o++;
+ LogService.Write("寰幆:" + o);
//鏃ヨ鍒掔敤鏂欐竻鍗曟槑缁� 姣忎竴澶╃殑瀹為檯鐢ㄦ枡鎯呭喌
var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList();
//姣忎竴涓墿鏂欒繘琛屽簱瀛樿绠�
@@ -823,8 +831,9 @@
decimal planNeed = _item.PlanCount; //涓嶅弬涓庤绠� 鐢ㄤ簬璁板綍
decimal need = _item.PlanCount;//鍙備笌璁＄畻
decimal FOccupyPickedCount = 0;//鍗犵敤棰嗘枡鍗曟暟閲�
- //鎵惧埌棰嗙敤鏁伴噺
+ //鎵惧埌棰嗙敤鏁伴噺
var _DayPlanPickedModel = DayPlanPickedModel.Where(c => c.FPRDMOENTYID == _item.HICMOEntryID_Sec && c.FMATERIALID == _item.FMATERIALID2).FirstOrDefault();
+
if (_DayPlanPickedModel.FRemainPickedQty >= need)
{
//棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
@@ -855,19 +864,24 @@
});
//鎵ｉ櫎鍓╀綑鍙敤棰嗘枡鏁伴噺
_DayPlanPickedModel.FRemainPickedQty -= need;
+ LogService.Write($"h" + need);
//寰幆涓嬩竴涓墿鏂�
continue;
}
else
{
+ LogService.Write($"kxs" + need);
need -= _DayPlanPickedModel.FRemainPickedQty; //鍓╀綑闇�姹傛暟閲�
+ LogService.Write($"i1" + need);
FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
_DayPlanPickedModel.FRemainPickedQty = 0;
+ LogService.Write($"i" + need);
}
if (_pRD_WorkHouseCompar.Count > 0)
{
//缂烘枡鏁伴噺 闇�姹傛暟閲� - 瀹為檯搴撳瓨 >0 ? 涓�涓墿鏂欎笉绠″崰鐢ㄥ灏戞潯 搴撳瓨+璐т富 鏁版嵁 缂烘枡鏁伴噺鏄悓涓�涓暟閲�
decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0;
+ LogService.Write($"j" + _fLackCount);
//LogHelper.Info("缁勭粐锛�" + _item.FStockOrgId + " ,鍙婃椂搴撳瓨" + jskcQty);
//鎬诲簱瀛樹负0浜� 鐩存帴缁欏嚭 缂烘枡鏁伴噺
if (jskcQty == 0)
@@ -900,6 +914,8 @@
//缁堟璇ョ墿鏂欒绠� 杩涘叆涓嬩竴涓�
continue;
}
+
+ LogService.Write($"k" + 2);
foreach (var WorkHouse in _pRD_WorkHouseCompar)
{
//搴撳瓨鏁版嵁鍖归厤
@@ -1574,7 +1590,9 @@
List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
//sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
List<string> sqlList = new List<string>();
- string Error = "杩愮畻澶辫触!";
+
+ LogService.Write("1");
+ string Error = "";
foreach (var item in MaterialIDList)
{
//褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
@@ -1584,6 +1602,9 @@
Error+="[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FNumber + " 搴撳瓨缁勭粐锛�" + item.FStockOrgName + " ";
continue;
}
+
+ LogService.Write("1.1");
+
////LogHelper.Info(item.FMATERIALID.ToString());
//褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
@@ -1597,6 +1618,9 @@
DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//绗竴涓璐ц捣濮嬫棩鏈�
int i = 0;
//璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
+
+ LogService.Write("1.2");
+
List<int> FEntryIdList = new List<int>();
foreach (var _item in _DayPlanPpbom)
{
@@ -1607,13 +1631,25 @@
break;
}
+ LogService.Write("1.2.1");
+
if (NeedQty == 0)
+ {
DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
+ }
FEntryIdList.Add(_item.FENTRYID);
NeedQty += _item.NeedQty;
-
- if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //璁㈠崟涓撶敤涓�х被
+ //LogService.Write(FJITmaterialGroup);
+ //LogService.Write(FEntryIdList.Count);
+ //LogService.Write(Convert.ToDouble(FJITMaterielDemand));
+ //LogService.Write(_DayPlanPpbom.Count);
+ //LogService.Write(i);
+ if ((FJITmaterialGroup == "鎬婚噺鎺у埗瑙勬牸绫�" || FJITmaterialGroup == "璁㈠崟涓撶敤涓�х被") && FEntryIdList.Count < Convert.ToDouble(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //璁㈠崟涓撶敤涓�х被
+ {
continue;
+ }
+
+ LogService.Write("1.2.2");
foreach (var Purchase in _PurchaseInventory)
{
@@ -1657,6 +1693,9 @@
//鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
DayPlanPpbomls.NeedQty = 0;
}
+
+ LogService.Write("1.2.3");
+
FEntryIdList.Clear();
//鏇存柊閲囪喘璁㈠崟
//sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
@@ -1733,17 +1772,22 @@
}
}
}
+
+ LogService.Write("1.2.4");
+
NeedQty = 0;
}
}
+
//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}");
int tlmmm = 0;
JArray FinalyResult = new JArray();
-
+ LogService.Write("2");
+
foreach (var item in PODemandPlanList)
{
tlmmm++;
@@ -1915,12 +1959,22 @@
// tlmmm++;
}
- if (tlmmm == PODemandPlanList.Count && tlmmm != 0)
+ LogService.Write("3");
+ if (Error != "")
+ {
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩愮畻鎴愬姛!" + Error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (tlmmm == PODemandPlanList.Count && tlmmm != 0)
{
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "杩愮畻鎴愬姛!";
+ objJsonResult.Message = "杩愮畻鎴愬姛!" + Error;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1929,7 +1983,7 @@
oCN.RollBack();//浜嬪姟鍥炴粴
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = Error;
+ objJsonResult.Message = "杩愮畻澶辫触!" + Error;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1938,11 +1992,11 @@
//////LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
//DBServiceHelper.ExecuteBatch(Context, sqlList);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎻愭枡杩愮畻鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "鎻愭枡杩愮畻鎴愬姛锛�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
}
catch (Exception e)
{
--
Gitblit v1.9.1