From 32697b2f31356dc6be27dea34ff2eccc5fdd0582 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 31 八月 2023 16:12:45 +0800
Subject: [PATCH] 涤纶半成品生成条码模块，出站汇报单单据号、单据ID获取修改
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 212 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 187 insertions(+), 25 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..2a7ef44 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"
@@ -8,6 +8,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Diagnostics;
+using System.Threading;
namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
{
@@ -42,7 +43,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;
@@ -220,14 +222,16 @@
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
"HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
- "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)values" +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty" +
+ ",HICMOInterID,HICMOEntryID)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
$" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
$"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
- $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})";
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty}," +
+ $"{HMainSourceInterID},{HMainSourceEntryID})";
//LogService.Write("sql:" + sql);
//涓昏〃
@@ -241,6 +245,13 @@
var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
var HSourceID = list[i]["HSourceID"].ToString();
var HYX = list[i]["浼樺厛绾�"].ToString();
+ var HWorkQty = list[i]["灏忔椂浜ц兘"].ToString();
+ var HProdTimes = list[i]["鐢熶骇鍛ㄦ湡"].ToString();
+ var HReadyTimes = list[i]["寮�宸ヤ綑閲�"].ToString();
+ var HLastBeginDate = list[i]["鏈�杩熷紑宸ユ棩鏈�"].ToString();
+ var HLastEndDate = list[i]["鏈�杩熷畬宸ユ棩鏈�"].ToString();
+ var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
+ var HOrderCommitDate = list[i]["璁㈠崟浜よ揣鏈�"].ToString();
if (HSourceID == "" || HSourceID == "0")
{
@@ -272,7 +283,10 @@
return objJsonResult;
}
- oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX}" +
+ $",HWorkQty={HWorkQty},HProdTimes={HProdTimes},HReadyTimes={HReadyTimes},HLastBeginDate='{HLastBeginDate}'" +
+ $",HLastEndDate='{HLastEndDate}',HOrderNeedQty={HOrderNeedQty},HOrderCommitDate='{HOrderCommitDate}'" +
+ $" where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
}
oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["鍗曟嵁鍙�"].ToString(): HBillNo)}'");
@@ -289,8 +303,8 @@
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())
- , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
-
+ , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString())
+ , list[i]);
if (objJsonResult.count == 1)
{
TrueCount += 1;
@@ -299,7 +313,7 @@
//涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
{
- objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+ objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0, list[i]);
}
}
}
@@ -332,11 +346,10 @@
}
}
- public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY)
+ public json AddBillSub(string HInterID, string HBillNo, DateTime date, int HQTY, Dictionary<string, string> dic)
{
//鑾峰彇琛ㄦ牸鏁版嵁
ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 鍗曟嵁鍙�='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");
-
int count = 0;
if (ds.Tables[0].Rows.Count > 0)
{
@@ -345,7 +358,7 @@
{
if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
{
- oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
+ oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY},HUseTimes={(dic["灏忔椂浜ц兘"]=="0"?0: HQTY / float.Parse(dic["灏忔椂浜ц兘"].ToString()))}" +
$" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
count += 1;
}
@@ -356,9 +369,9 @@
{
//鎻掑叆瀛愯〃
oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
- "HMasterDate,HQty)" +
+ "HMasterDate,HQty,HUseTimes)" +
$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
- $" '{date}', {HQTY})");
+ $" '{date}', {HQTY},{(dic["灏忔椂浜ц兘"] == "0" ? 0 : HQTY / float.Parse(dic["灏忔椂浜ц兘"].ToString()))})");
}
objJsonResult.code = "1";
@@ -776,8 +789,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 +802,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 +842,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 +875,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 +925,8 @@
//缁堟璇ョ墿鏂欒绠� 杩涘叆涓嬩竴涓�
continue;
}
+
+ LogService.Write($"k" + 2);
foreach (var WorkHouse in _pRD_WorkHouseCompar)
{
//搴撳瓨鏁版嵁鍖归厤
@@ -1574,7 +1601,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 +1613,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 +1629,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 +1642,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 +1704,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 +1783,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 +1970,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 +1994,7 @@
oCN.RollBack();//浜嬪姟鍥炴粴
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = Error;
+ objJsonResult.Message = "杩愮畻澶辫触!" + Error;
objJsonResult.data = null;
return objJsonResult;
}
@@ -1938,11 +2003,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)
{
@@ -2534,5 +2599,102 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏁版嵁鍑嗗 璁剧疆浠诲姟鍗曠浉鍏充俊鎭�
+ [Route("JIT_DayPlanPlatFormBill/ReadyData")]
+ [HttpGet]
+ public object ReadyData(string HICOMNum)
+ {
+ try
+ {
+ var list = HICOMNum.Split(',');
+ DataTable dt = new DataTable("date");
+ dt.Columns.Add("HICMOInterID", typeof(string));
+ dt.Columns.Add("HICMOEntryID", typeof(string));
+ dt.Columns.Add("灏忔椂浜ц兘", typeof(string));
+ dt.Columns.Add("鐢熶骇鍛ㄦ湡", typeof(decimal));
+ dt.Columns.Add("寮�宸ヤ綑閲�", typeof(decimal));
+ dt.Columns.Add("鏈�杩熷紑宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("鏈�杩熷畬宸ユ棩鏈�", typeof(DateTime));
+ dt.Columns.Add("璁㈠崟闇�姹傛暟閲�", typeof(decimal));
+ dt.Columns.Add("璁㈠崟浜よ揣鏈�", typeof(DateTime));
+
+ for (int i = 0; i < list.Length; i++)
+ {
+ string HICMOInterID = list[i].Split(';')[0].ToString();
+ string HICMOEntryID = list[i].Split(';')[1].ToString();
+
+ Thread.Sleep(100);
+ ds = oCN.RunProcReturn("exec h_p_Sc_GetInfoByICMOBillNo " + HICMOInterID+","+ HICMOEntryID, "h_p_Sc_GetInfoByICMOBillNo");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+
+ }
+ else
+ {
+ DataRow dr = dt.NewRow();
+ dr["灏忔椂浜ц兘"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["浜ц兘"]);
+ dr["鐢熶骇鍛ㄦ湡"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["鐢熶骇鍛ㄦ湡"]);
+ dr["寮�宸ヤ綑閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["寮�宸ヤ綑閲�"]);
+ dr["鏈�杩熷紑宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷紑宸ユ棩鏈�"]);
+ dr["鏈�杩熷畬宸ユ棩鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["鏈�杩熷畬宸ユ棩鏈�"]);
+ dr["璁㈠崟闇�姹傛暟閲�"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["璁㈠崟闇�姹傛暟"]);
+ dr["璁㈠崟浜よ揣鏈�"] = DBUtility.ClsPub.isDate(ds.Tables[0].Rows[0]["璁㈠崟浜よ揣鏈�"]);
+ dr["HICMOInterID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOInterID"]);
+ dr["HICMOEntryID"] = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[0]["HICMOEntryID"]);
+ dt.Rows.Add(dr);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂烘枡鍒嗘瀽鎶ヨ〃
+ public class MaterialShorAnalysis
+ {
+ public int? HORGID;
+ public DateTime HBEGINDATE;
+ public DateTime HENDDATE;
+ }
+ [Route("JIT_DayPlanPlatFormBill/MaterialShorAnalysisReport")]
+ [HttpGet]
+ public object MaterialShorAnalysisReport(string sWhere)
+ {
+ try
+ {
+ MaterialShorAnalysis Report = JsonConvert.DeserializeObject<MaterialShorAnalysis>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_MaterialShorAnalysisReportList {Report.HORGID},'{Report.HBEGINDATE}','{Report.HENDDATE}' ", "h_p_JIT_PODemandPlanBill_ReportList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1