From 2d3fc93b131c7aa771e8f7d08a82d5e9b4946eff Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 29 六月 2023 16:02:39 +0800
Subject: [PATCH] 提料计划运算(缺料) 日志添加自定义名称方法
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 1468 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,404 insertions(+), 64 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 8f3a078..70089ce 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"
@@ -20,6 +20,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
public static string BillType = "4610";
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏌ヨ
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList")]
@@ -73,7 +74,7 @@
{
if (num == 1)
{
- ds = oCN.RunProcReturn($"select isnull(DATEDIFF(DAY,GETDATE(),CONVERT(varchar(10),max(HMasterDate),20)),0) DayNum from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and HLockedSub=1", "Sc_WorkBillSortBillSub");
+ ds = oCN.RunProcReturn($"select isnull(DATEDIFF(DAY,GETDATE(),CONVERT(varchar(10),max(HMasterDate),20))+1,0) DayNum from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and HLockedSub=1", "Sc_WorkBillSortBillSub");
}
else if (num == 2)
{
@@ -189,7 +190,7 @@
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
- if (HSourceID == "")
+ if (HSourceID == ""|| HSourceID == "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -198,7 +199,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceEntryID={HMainSourceEntryID}" +
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -213,8 +214,7 @@
HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- //涓昏〃
- oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ string sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
@@ -227,7 +227,52 @@
$" {(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})";
+
+ //LogService.Write("sql:" + sql);
+ //涓昏〃
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
+ var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HYX = list[i]["浼樺厛绾�"].ToString();
+
+ if (HSourceID == "" || HSourceID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var str = 0;
+ if (!int.TryParse(HYX, out str))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛屼紭鍏堢骇:{HYX},璇疯緭鍏ユ暟瀛�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ 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 HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["鍗曟嵁鍙�"].ToString(): HBillNo)}'");
@@ -483,6 +528,14 @@
/// 浠撳簱缂栫爜
/// </summary>
public string FStockNumber { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string HLOT { get; set; }
+ /// <summary>
+ /// id
+ /// </summary>
+ public string HInventoryFID { get; set; }
}
#endregion
@@ -646,6 +699,9 @@
public string FStock { get; set; }
//杞﹂棿
public string FWorkShop { get; set; }
+ //鎵瑰彿
+ public string HLOT { get; set; }
+ public string HInventoryFID { get; set; }
}
#endregion
@@ -705,20 +761,8 @@
//鑾峰彇褰撳墠鍗虫椂搴撳瓨 搴撳瓨鏁伴噺+搴撳瓨缁勭粐+鐗╂枡+璐т富+浠撳簱
ds = oCN.RunProcReturn(@"
-select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber from
-(
-select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from SC_WORKBILLSORTBILLMAIN a
-join SC_WORKBILLSORTBILLSub b on a.HInterID = b.HInterID
-join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
-join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
-) T1
-JOIN AIS20210811135644..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
-LEFT JOIN AIS20210811135644..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
-LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20210811135644..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
-join AIS20210811135644..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
-where a.FBASEQTY>0
-", "SC_WORKBILLSORTBILLMAIN");
+select * from h_v_jit_InventoryList
+", "h_v_jit_InventoryList");
ListInventory = ds.ToModelList<PRD_Inventory>();
//杞﹂棿 浠撳簱瀵圭収鍒楄〃
ds = oCN.RunProcReturn(@"
@@ -730,25 +774,7 @@
//鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
var DatePlanList = BomList.GroupBy(p => new { p.HMasterDate, p.HICMOEntryID_Sec }).Select(x => new PRD_PPBOM { HMasterDate = x.Key.HMasterDate, HICMOEntryID_Sec = x.Key.HICMOEntryID_Sec }).ToList();
//鍙栧簲鍙戞暟閲� FMustQty 涓嶈鍙栧�奸渶姹傛暟閲廎NeedQty 棰嗘枡鏁版嵁
- string LLsql = string.Format(@"
-select max(t1.FCXStockInQty)FCXStockInQty,FPRDMOENTYID,max(dwyl)dwyl,sum(FPickedQty)FPickedQty,sum(FRemainPickedQty)FRemainPickedQty,FMATERIALID from
-(
-select a.FCXStockInQty, FPRDMOENTYID,convert( decimal(18,2),FMustQty/FQty ) as dwyl,FPickedQty,T2.FMATERIALID,
-case when convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty))< 0 then 0
-else convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty)) end as FRemainPickedQty
- from
-(
-select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
-where a.HInterID IN ({0})
-group by HICMOEntryID_Sec
-) a
-join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
-LEFT JOIN AIS20210811135644..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID
-) t1
-group by FPRDMOENTYID,FMATERIALID
-", fDayPlanFids);
+ string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
@@ -923,7 +949,9 @@
FComPlete = jskcQty >= need ? "榻愬" : "鏈綈濂�",
FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
FStock = Inventory.FSTOCKID,//浠撳簱
- FWorkShop = _item.HWorkShopID //杞﹂棿
+ FWorkShop = _item.HWorkShopID, //杞﹂棿
+ HLOT = Inventory.HLOT, //鎵瑰彿
+ HInventoryFID = Inventory.HInventoryFID //id
});
//鎵ｅ噺鎬诲簱瀛樻暟閲�
jskcQty = jskcQty >= fCompleteCount ? jskcQty - fCompleteCount : 0;
@@ -1002,6 +1030,8 @@
insertDT.Columns.Add("FWORKSHOPID", typeof(long));
insertDT.Columns.Add("FSTOCKID", typeof(long));
insertDT.Columns.Add("FOCCUPYPICKEDCOUNT", typeof(decimal));
+ insertDT.Columns.Add("HLOT", typeof(long));
+ insertDT.Columns.Add("HInventoryFID", typeof(string));
int jdtmmm = 1;
ds = oCN.RunProcReturn("select max(HInterID)FID FROM JIT_MOMaterReadysBill", "JIT_MOMaterReadysBill");
int maxFid = int.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString());
@@ -1034,6 +1064,8 @@
dr["FWORKSHOPID"] = item.FWorkShop == null ? "0" : item.FWorkShop;
dr["FSTOCKID"] = item.FStock == null ? "0" : item.FStock;
dr["FOCCUPYPICKEDCOUNT"] = item.FOccupyPickedCount;
+ dr["HLOT"] = item.HLOT == null? "0" : item.HLOT;
+ dr["HInventoryFID"] = item.HInventoryFID == null ? "0" : item.HInventoryFID;
insertDT.Rows.Add(dr);
jdtmmm++;
}
@@ -1049,12 +1081,14 @@
", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
- ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" +
+ ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo" +
+ ",HLOT,HInventoryFID)values" +
$"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
$", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
$" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
$", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
- $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')");
+ $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
+ $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
}
LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
@@ -1095,18 +1129,1290 @@
}
#endregion
- #region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
- [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay")]
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鎻愭枡杩愮畻
+
+ #region 鏃ヨ鍒掑睍寮�鏁版嵁鏄庣粏
+ public class DayPlanPpbom
+ {
+
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曚富ID
+ /// </summary>
+ public long FID { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙�
+ /// </summary>
+ public string FBILLNO { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁嗘棩鏈�
+ /// </summary>
+ public DateTime FHMASTERDATE { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁嗘暟閲�
+ /// </summary>
+ public decimal FHQTY { get; set; }
+ /// <summary>
+ /// 榻愬鏁�
+ /// </summary>
+ public decimal FCOMPLETECOUNT { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟宸ュ崟ID
+ /// </summary>
+ public long FPRDMOMAINID { get; set; }
+ /// <summary>
+ /// 瀛愯〃ID
+ /// </summary>
+ public int FENTRYID { get; set; }
+ /// <summary>
+ /// 鍗曚綅鐢ㄦ枡
+ /// </summary>
+ public decimal FNeedQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public string FMATERIALID { get; set; }
+ /// <summary>
+ /// 鎻愬墠澶╂暟
+ /// </summary>
+ public int FFIXLEADTIME { get; set; }
+ /// <summary>
+ ///鏈�澶у寘瑁�
+ /// </summary>
+ public decimal FMAXPOQTY { get; set; }
+ /// <summary>
+ /// 鏈�灏忓寘瑁呴噺
+ /// </summary>
+ public decimal FMINPOQTY { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string FNumber { get; set; }
+ /// <summary>
+ /// 瀹為檯闇�姹�
+ /// </summary>
+ public decimal NeedQty { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ public long FStockOrgId { get; set; }
+ //搴撳瓨缁勭粐鍚嶇О
+ public string FStockOrgName { get; set; }
+ /// <summary>
+ /// jit鐗╂枡鍒嗙被
+ /// </summary>
+ public string FJITmaterialGroup { get; set; }
+ /// <summary>
+ /// JIT鐗╂枡闇�姹備緵璐у懆鏈�
+ /// </summary>
+ public string FJITMaterielDemand { get; set; }
+ /// <summary>
+ /// JIT瀹夊叏搴撳瓨
+ /// </summary>
+ public string FJITSafeStock { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ /// </summary>
+ public string FErpClsID { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鍙凤紙閿�鍞鍗曞彿锛�
+ /// </summary>
+ public string FXQD { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曞崟鍙�
+ /// </summary>
+ public string FDAYPLANBILLNO { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿缂栫爜
+ /// </summary>
+ public string FWORKSHOPNUMBER { get; set; }
+
+
+ }
+ #endregion
+
+ #region 閲囪喘璁㈠崟鐗╂枡搴撳瓨
+ public class PurchaseInventory
+ {
+ /// <summary>
+ /// 閲囪喘FID
+ /// </summary>
+ public long FID { get; set; }
+ //閲囪喘璁㈠崟鍗曞彿
+ public string FBillNo { get; set; }
+ /// <summary>
+ /// 閲囪喘瀛愯〃鏍囪瘑
+ /// </summary>
+ public long FENTRYID { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
+ public long FSUPPLIERID { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string FNUMBER { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public string FMATERIALID { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string FMATERIALNUMBER { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鏁伴噺
+ /// </summary>
+ public decimal FQTY { get; set; }
+
+ /// <summary>
+ /// 閲囪喘缁勭粐
+ /// </summary>
+ public long FStockOrgId { get; set; }
+ /// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
+ /// <summary>
+ /// 缁勭粐缂栫爜
+ /// </summary>
+ public string FORGNumber { get; set; }
+ /// <summary>
+ /// 鎻愬墠鏈�
+ /// </summary>
+ public int FFIXLEADTIME { get; set; }
+
+ /// <summary>
+ /// 闇�姹傚崟鍙�
+ /// </summary>
+ public string FXQD { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑鍒涘缓浜�
+ /// </summary>
+ public string FCREATORID { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑鍒涘缓浜哄悕绉�
+ /// </summary>
+ public string FName { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑閲囪喘鏃ユ湡
+ /// </summary>
+ public DateTime FDate { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑浜よ揣鏃ユ湡
+ /// </summary>
+ public DateTime FDeliveryDate { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛ㄥご鎽樿
+ /// </summary>
+ public string F_QIMB_NOTE { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ /// </summary>
+ public string FNOTE { get; set; }
+ //閲囪喘閮ㄩ棬
+ public string FPURCHASEDEPTNUMBER { get; set; }
+
+ /// <summary>
+ /// 鏀舵枡浣嗘槸娌″叆搴撻儴鍒� 闇�瑕佷紭鍏堝幓鎵ｉ櫎
+ /// </summary>
+ public decimal FReceiveNotInQty { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟鏁伴噺
+ /// </summary>
+ public decimal FPURCHASEQTY { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟鍏宠仈鏁伴噺
+ /// </summary>
+ public decimal FJOINQTY { get; set; }
+
+ /// <summary>
+ /// 鏀舵枡鍗曟暟閲�
+ /// </summary>
+ public decimal FReceiveQty { get; set; }
+ }
+ #endregion
+
+ #region 鎻愭枡璁″垝涓存椂鍌ㄥ瓨
+ public class PODemandPlanTemp
+ {
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曚富ID
+ /// </summary>
+ public long FID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曠紪鍙�
+ /// </summary>
+ public string FBILLNO { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁嗘棩鏈�
+ /// </summary>
+ public DateTime FHMASTERDATE { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁嗘暟閲�
+ /// </summary>
+ public decimal FHQTY { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟宸ュ崟ID
+ /// </summary>
+ public long FPRDMOMAINID { get; set; }
+ /// <summary>
+ /// 瀛愯〃ID
+ /// </summary>
+ public int FENTRYID { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal FQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public string FMATERIALID { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string FNumber { get; set; }
+
+ /// <summary>
+ /// 閲囪喘FID
+ /// </summary>
+ public long PurchseFID { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟鍗曞彿
+ /// </summary>
+ public string PurchseFBillNo { get; set; }
+ /// <summary>
+ /// 閲囪喘瀛愯〃鏍囪瘑
+ /// </summary>
+ public long PurchseFentryID { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
+ public long FSUPPLIERID { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ public string PurchseFNUMBER { get; set; }
+
+ /// <summary>
+ /// 鏃ヨ鍒掓棩鏈�
+ /// </summary>
+ public DateTime OLDDATE { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鏁伴噺
+ /// </summary>
+ public decimal PurchseFqty { get; set; }
+
+ /// <summary>
+ /// 鎻愬墠鏈�
+ /// </summary>
+ public double FFIXLEADTIME { get; set; }
+
+ /// <summary>
+ /// 閲囪喘缁勭粐
+ /// </summary>
+ public long FStockOrgId { get; set; }
+ /// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
+ /// <summary>
+ /// 缁勭粐缂栫爜
+ /// </summary>
+ public string FORGNumber { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ /// </summary>
+ public string FErpClsID { get; set; }
+
+ /// <summary>
+ /// 闇�姹傚崟鍙�
+ /// </summary>
+ public string FXQD { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑鍒涘缓浜�
+ /// </summary>
+ public string FCREATORID { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑鍒涘缓浜哄悕绉�
+ /// </summary>
+ public string FName { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑閲囪喘鏃ユ湡
+ /// </summary>
+ public DateTime FDate { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟涓婄殑浜よ揣鏃ユ湡
+ /// </summary>
+ public DateTime FDeliveryDate { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛ㄥご鎽樿
+ /// </summary>
+ public string F_QIMB_NOTE { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ /// </summary>
+ public string FNOTE { get; set; }
+
+ /// <summary>
+ /// 閲囪喘閮ㄩ棬
+ /// </summary>
+ public string FPURCHASEDEPTNUMBER { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曞崟鍙�
+ /// </summary>
+ public string FDAYPLANBILLNO { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿缂栫爜
+ /// </summary>
+ public string FWORKSHOPNUMBER { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟鏁伴噺
+ /// </summary>
+ public decimal FPURCHASEQTY { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟鍏宠仈鏁伴噺
+ /// </summary>
+ public decimal FJOINQTY { get; set; }
+ }
+ #endregion
+
+ [Route("JIT_DayPlanPlatFormBill/JIT_TLYS")]
[HttpGet]
- public object JIT_DayPlanPlatFormBillHLockedDay(string sWhere, int HLockedDay)
+ public object JIT_TLYS(string sWhere, string user,string HTLType)
{
try
{
- if (sWhere != null && sWhere != "")
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+
+ string fProWorkShopId = omdelMian.HWorkShopID.ToString();
+ var fPrdOrgId = omdelMian.HProdORGID;
+ string sqlName = "";//AIS20210811135644
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
{
- oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=1" +
- $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉")
+ {
+ sqlName = "AIS20230129011339";
+ }
+ else
+ {
+ sqlName = "AIS20210811135644";
+ }
}
+
+ if (HTLType == "缂烘枡")
+ {
+ objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
+ }
+ else if (HTLType == "鐢熶骇鐢ㄦ枡娓呭崟")
+ {
+ objJsonResult=(json)JIT_PPBOM(fProWorkShopId, fPrdOrgId, user, sqlName);
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 閫氳繃缂烘枡鎯呭喌绠楁彁鏂�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_QL(string HWorkShopID,int? HProdORGID,string user,string sqlName) {
+ try
+ {
+
+ oCN.BeginTran();
+
+ DataSet DaSet = oCN.RunProcReturn($"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},1", "JIT_MOMaterReadysBill");
+
+ if (DaSet.Tables[0].Rows[0][0].ToString() != "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁,璇峰厛榻愬鍒嗘瀽!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //Stopwatch sw = new Stopwatch();
+ //sw.Start();//寮�濮嬭鏃�
+ //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺
+ // string sql = string.Format(@"
+ // /*dialect*/
+ //exec [鎻愭枡璁″垝棰勫鐞哴
+ //");
+ // DBServiceHelper.Execute(Context, sql);
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
+ //閲囪喘璁㈠崟鏁版嵁
+ string sql = $@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},2";
+ DataSet ds = oCN.RunProcReturn(sql, "t_PUR_POOrderEntry");
+ List<PurchaseInventory> PurchaseInventory = ds.ToModelList<PurchaseInventory>();
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
+ sql = string.Format($@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},3");
+ ////LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
+ ds = oCN.RunProcReturn( sql, "JIT_MOMaterReadysBill");
+ List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
+ //鐗╂枡+搴撳瓨缁勭粐鍒嗙被
+ var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FNumber,p.FStockOrgName, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FNumber=x.Key.FNumber, FStockOrgId = x.Key.FStockOrgId , FStockOrgName =x.Key.FStockOrgName }).ToList();
+ //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
+ List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
+ //sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
+ List<string> sqlList = new List<string>();
+ string Error = "杩愮畻澶辫触!";
+ foreach (var item in MaterialIDList)
+ {
+ //褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
+ 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)
+ {
+ Error+="[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FNumber + " 搴撳瓨缁勭粐锛�" + item.FStockOrgName + " ";
+ continue;
+ }
+ ////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;//鏈�灏忚捣璁㈤噺
+ double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//鎻愬墠鏈�
+ //double FFIXLEADTIME = 3;//鎻愬墠鏈�(2022-1-26 鎻愬墠鏈熸敼涓�3澶� 涔冩案鍒氬弽棣�)
+ string FJITmaterialGroup = _DayPlanPpbom.FirstOrDefault().FJITmaterialGroup;//jit鐗╂枡鍒嗙被
+ string FJITMaterielDemand = _DayPlanPpbom.FirstOrDefault().FJITMaterielDemand; //JIT鐗╂枡闇�姹備緵璐у懆鏈�
+ string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT瀹夊叏搴撳瓨
+ decimal NeedQty = 0;
+ DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//绗竴涓璐ц捣濮嬫棩鏈�
+ int i = 0;
+ //璁板綍鍦ㄦ渶灏忛噰璐噺闇�姹備笅鐨勬棩璁″垝鏄庣粏FentyrID
+ List<int> FEntryIdList = new List<int>();
+ foreach (var _item in _DayPlanPpbom)
+ {
+ i++;
+ _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
+ if (_PurchaseInventory.Count == 0)
+ {
+ break;
+ }
+
+ 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) //璁㈠崟涓撶敤涓�х被
+ continue;
+
+ foreach (var Purchase in _PurchaseInventory)
+ {
+ if (Purchase.FQTY >= NeedQty)
+ {
+ foreach (int id in FEntryIdList)
+ {
+ var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = DayPlanPpbomls.FID,
+ FHMASTERDATE = DATE,
+ FQty = DayPlanPpbomls.NeedQty,
+ FBILLNO = DayPlanPpbomls.FBILLNO,
+ FENTRYID = DayPlanPpbomls.FENTRYID,
+ FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ FNumber = DayPlanPpbomls.FNumber,
+ OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ FFIXLEADTIME = FFIXLEADTIME,
+ FErpClsID = DayPlanPpbomls.FErpClsID,
+
+ PurchseFID = Purchase.FID,
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+ });
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ DayPlanPpbomls.NeedQty = 0;
+ }
+ FEntryIdList.Clear();
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ ls.FQTY -= NeedQty;
+ break;
+ }
+ else
+ {
+ //鏇存柊鎬婚渶姹傛暟閲�
+ NeedQty = NeedQty - Purchase.FQTY;
+ //閲囪喘璁㈠崟鏁伴噺
+ decimal _NeedQty = Purchase.FQTY;
+ List<int> mmm = new List<int>();
+ foreach (int id in FEntryIdList)
+ {
+ var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
+ decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
+
+ if (Qty > _NeedQty)
+ Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
+
+ _NeedQty = _NeedQty - Qty;
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = DayPlanPpbomls.FID,
+ FHMASTERDATE = DATE,
+ FQty = Qty,
+ FBILLNO = DayPlanPpbomls.FBILLNO,
+ FENTRYID = DayPlanPpbomls.FENTRYID,
+ FMATERIALID = DayPlanPpbomls.FMATERIALID,
+ FNumber = DayPlanPpbomls.FNumber,
+ OLDDATE = DayPlanPpbomls.FHMASTERDATE,
+ FFIXLEADTIME = FFIXLEADTIME,
+ FErpClsID = DayPlanPpbomls.FErpClsID,
+
+ PurchseFID = Purchase.FID,
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+ });
+ //鏇存柊璁″垝鏁伴噺锛堝墿浣欓渶瑕佹帓鐨勶級 缁х画鍘昏绠椾笅涓�涓噰璐鍗�
+ DayPlanPpbomls.NeedQty -= Qty;
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}");
+ //鏇存柊Model
+ var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
+ ls.FQTY -= Qty;
+ if (_NeedQty <= 0)
+ {
+ foreach (var mm in mmm)
+ {
+ FEntryIdList.Remove(mm);
+ }
+ break;
+ }
+ mmm.Add(id);
+ }
+ }
+ }
+ 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();
+
+
+ foreach (var item in PODemandPlanList)
+ {
+ tlmmm++;
+
+ DateTime date = item.FHMASTERDATE;
+ string PurchseFNUMBER = item.PurchseFNUMBER;
+ //JObject model = new JObject();
+ //model.Add("FHDate", date);
+ //model.Add("FDeliveryDate", date.AddDays(-3));//渚涘簲鍟嗛璁″彂璐ф棩鏈�
+ //model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
+ //model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
+
+ var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
+ var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
+ string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//鍒跺崟浜�
+ string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//淇敼浜�
+
+
+ var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join "+ sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "' and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //閲囪喘缁勭粐
+
+ var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
+ inner join " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
+ where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Supplier");
+ long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //渚涘簲鍟�
+
+ long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
+
+ //涓昏〃
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
+ ",HBillSubType,HDate,HBillStatus,HMaker,HMakeDate" +
+ ",HSubORGID ,HAddress,HPURCHASEORGID,HSupplierID ,HSettleCurrId" +
+ ",HRemark,HExplanation,HUpDater,HUpDateDate)" +
+ $"values({HInterID}, '{HBillNo}', {DateTime.Now.Year}, {DateTime.Now.Month}, '4608'" +
+ $", '4608','{date}',1, '{HMaker}',GETDATE()," +
+ $"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
+ $",'','','{HUpDater}',getdate())");
+
+ JArray Fentity = new JArray();
+ List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
+ //LogService.Write("娴嬭瘯listmodel锛�" + _PODemandPlanList[0].FORGNumber.ToString());
+ int i = 0;
+ foreach (var _item in _PODemandPlanList)
+ {
+ i++;
+ //if (!model.ToString().Contains("FHPURCHASEORGID"))
+ // model.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });
+ //JObject FentityModel = new JObject();
+ //FentityModel.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
+ //FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = _item.FNumber });//鐗╂枡
+ //FentityModel.Add("FHQty", _item.FQty);//鏁伴噺
+ //FentityModel.Add("FHSourceInterID", _item.FID);//鏃ヨ鍒掑伐鍗旻ID
+ //FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//鏃ヨ鍒掑伐鍗旻ENTRYID
+ //FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//鏃ヨ鍒掑伐鍗曞崟鍙�
+ //FentityModel.Add("FHSourceBillType", "");//鏃ヨ鍒掑伐鍗曠被鍨�
+ //FentityModel.Add("FDayPlanDate", _item.OLDDATE);//鏃ヨ鍒掑伐鍗曠被鍨�
+ //FentityModel.Add("FHRelationQty", _item.PurchseFqty);//鍏宠仈鏁伴噺
+ //FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//鎻愬墠鏈�
+ //FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//閲囪喘缁勭粐
+ //FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// 閲囪喘璁㈠崟鍐呯爜锛欶HPOOrderInterID
+ //FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
+ //FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
+ //FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
+ //FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
+ //Fentity.Add(FentityModel);
+
+
+ var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
+ inner join " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ where FNUMBER='" + _item.FNumber + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Material");
+ string HMaterID = "0"; //鐗╂枡
+ string HMaterModel = ""; //鐗╂枡浠ｇ爜
+ string HMaterName = ""; //鐗╂枡鍚嶇О
+ if (dataSet.Tables[0].Rows.Count != 0)
+ {
+ HMaterID = dataSet.Tables[0].Rows[0]["HItemID"].ToString(); //鐗╂枡
+ HMaterModel = dataSet.Tables[0].Rows[0]["HNumber"].ToString(); //鐗╂枡浠ｇ爜
+ HMaterName = dataSet.Tables[0].Rows[0]["HName"].ToString(); //鐗╂枡鍚嶇О
+ }
+
+ decimal HQty = _item.FQty; //鏁伴噺
+ long HSourceInterID = _item.FID; //鏃ヨ鍒掑伐鍗旻ID
+ long HSourceEntryID = _item.FENTRYID;//鏃ヨ鍒掑伐鍗旻ENTRYID
+ string HSourceBillNo = _item.FBILLNO; //鐢熶骇璁㈠崟鍙�
+ string HSourceBillType = ""; //鏃ヨ鍒掑伐鍗曠被鍨�
+ DateTime HDayPlanDate = _item.OLDDATE; // 宸ュ崟鐢熶骇鏃ユ湡
+ decimal HRelationQty = _item.PurchseFqty; // 鍏宠仈鏁伴噺
+ double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
+
+ dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + _item.FORGNumber + "' and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // 閲囪喘缁勭粐
+ long HPOOrderInterID = _item.PurchseFID; // 閲囪喘璁㈠崟鍐呯爜
+ long HPOOrderEntryID = _item.PurchseFentryID; // 閲囪喘璁㈠崟瀛愬唴鐮�
+ string HPOOrderBillNo = _item.PurchseFBillNo; // 閲囪喘璁㈠崟鍙�
+ string HErpClsID = _item.FErpClsID; // 鐗╂枡灞炴��
+ long HUnitID = 10101; // 璁￠噺鍗曚綅 鍏堟寜鐓ф湰鍦版潵 榛樿 Pcs
+ string HSeOrderBillNo = _item.FXQD; // 閿�鍞鍗曞彿 闇�姹傚崟鍙�
+ string HOrderEmpID = _item.FCREATORID; // 閲囪喘鍛�
+ DateTime HPOOrderBillDate = _item.FDate; // 閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+ DateTime HPOOrderBillDeliveryDate = _item.FDeliveryDate; // 閲囪喘璁㈠崟浜よ揣鏃ユ湡
+ string HPOOrderBillRemark = _item.F_QIMB_NOTE; // 閲囪喘璁㈠崟鎽樿
+ string HPOOrderBillNote = _item.FNOTE; // 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FWORKSHOPNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
+ HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 鐢熶骇杞﹂棿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
+ string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 閲囪喘閮ㄩ棬
+
+ decimal HPURCHASEQTY = _item.FPURCHASEQTY; // 閲囪喘璁㈠崟鏁伴噺
+ decimal HJoinQty = _item.FJOINQTY; // 閲囪喘璁㈠崟鍏宠仈鏁伴噺
+
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
+ ", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
+ ", HPURCHASEORGID, HStatus, HFixleadTime, HDayPlanBillNo, HSourceInterID" +
+ ", HSourceEntryID, HSourceBillNo, HSourceBillType, HWorkShopID, HDayPlanDate" +
+ ", HRelationQty1, HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HPOOrderBillSEQ" +
+ ", HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo, HPurchaseDeptID, HCloseTypeSub" +
+ ", HCloseMan, HEntryCloseDate, HSendQty, HReciveQty, HCloseStatus" +
+ ", HRemoveQty, HSeOrderBillNo, HUnReciveQty, HPOOrderBillDate, HPOOrderBillDeliveryDate" +
+ ", HPOOrderBillRemark, HPOOrderBillNote)" +
+ $"values({HInterID}, {i}, '', {(HMaterID == null ? "0" : HMaterID)}, '{HMaterName}'" +
+ $", '{HMaterModel}', {HUnitID}, '{HErpClsID}', {HQty}, ''" +
+ $", {HPURCHASEORGIDSub}, '', {HFixleadTime}, '{HDayPlanBillNo}', {HSourceInterID}" +
+ $", {HSourceEntryID}, '{HSourceBillNo}', '{HSourceBillType}', {HWorkShopID}, '{HDayPlanDate}'" +
+ $", {HRelationQty}, {HPOOrderInterID},{HPOOrderEntryID}, '{HPOOrderBillNo}',0" +
+ $",0,0, '',{HPurchaseDeptID}, '0'" +
+ $", '','',0,0, '0'" +
+ $",0, '{HSeOrderBillNo}',0, '{HPOOrderBillDate}', '{HPOOrderBillDeliveryDate}'" +
+ $", '{HPOOrderBillRemark}', '{HPOOrderBillNote}')");
+
+ }
+ //model.Add("FEntity", Fentity);
+ //FinalyResult.Add(model);
+ // if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
+ // {
+ // //LogHelper.Info("鎻愭枡璁″垝鏂板鎵归噺鎵ц锛岃褰曞惊鐜殑褰撳墠鏉℃暟" + tlmmm);
+ // JObject jsonRoot = new JObject()
+ // {
+ // ["Creator"] = "",
+ // ["NeedUpDateFields"] = new JArray(),
+ // ["NeedReturnFields"] = new JArray(),
+ // ["IsDeleteEntry"] = "false",
+ // ["SubSystemId"] = "",
+ // ["IsVerifyBaseDataField"] = "false",
+ // ["Model"] = FinalyResult
+ // };
+ // CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ // var result = cloudClient.BatchSave("paez_PODemandPlan", jsonRoot.ToString());
+ // JObject saveObj = JObject.Parse(result);
+ // string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ // if (saveIsSuc != "TRUE")
+ // {
+ // //LogHelper.Error(jsonRoot.ToString());
+ // }
+ // FinalyResult = new JArray();
+ // }
+ // tlmmm++;
+ }
+
+ if (tlmmm == PODemandPlanList.Count && tlmmm != 0)
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩愮畻鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = Error;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ////sw.Stop();//缁撴潫璁℃椂
+ //////LogHelper.Info("鎻愭枡璁″垝鎵ц瀹屾垚锛岃繍琛屾�绘椂闀匡細" + sw.Elapsed);
+ //DBServiceHelper.ExecuteBatch(Context, sqlList);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎻愭枡杩愮畻鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ /// <summary>
+ /// 閫氳繃鐢熶骇鐢ㄦ枡娓呭崟 绠楃己鏂欐儏鍐�
+ /// </summary>
+ /// <returns></returns>
+ public object JIT_PPBOM(string fProWorkShopId,int? fPrdOrgId,string user,string sqlName) {
+
+ try
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.Start();//寮�濮嬭鏃�
+ //鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 骞朵笖鏌ヨ鍑洪渶瑕佽繘琛岃繍绠楃殑鏁版嵁
+
+ oCN.BeginTran(); //寮�濮嬩簨鍔�
+
+ ds = oCN.RunProcReturn($"exec h_p_PROC_JIT_TLPLANYCL '{fProWorkShopId}','{fPrdOrgId}'", "h_p_PROC_JIT_TLPLANYCL");
+ List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
+
+ if (DayPlanPpbom.Count == 0)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹繍绠�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //閲囪喘璁㈠崟鏁版嵁 锛堝墿浣欐敹鏂欐暟閲忥級
+
+ //t2.FXQD t2.FSTOCKINQTY,t2.FReceiveQty 鏈湴娌℃湁杩欎簺瀛楁
+ string sql = string.Format(@"
+select * from h_v_jit_POOrderList where FQTY>0 and FCloseStatus in('A')
+and FMRPCLOSESTATUS in('A') and FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142') and FStockOrgId = '{0}'", fPrdOrgId);
+
+ ds = oCN.RunProcReturn(sql, "h_v_jit_POOrderList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤閲囪喘璁㈠崟鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<PurchaseInventory> PurchaseInventory = ds.ToModelList<PurchaseInventory>();
+ //鐗╂枡+搴撳瓨缁勭粐鍒嗙被
+ var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FStockOrgId = x.Key.FStockOrgId }).ToList();
+
+ //鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
+ List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
+ //sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
+ List<string> sqlList = new List<string>();
+
+ foreach (var item in MaterialIDList)
+ {
+ //this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(75) / MaterialIDList.Count) * i);
+ //褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
+ List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
+ decimal NeedQty = 0;
+ foreach (var _item in _DayPlanPpbom)
+ {
+ //鏌ヨ鏈夋病鏈夊彲浠ョ敤浜庢彁鏂欑殑閲囪喘璁㈠崟鏁版嵁
+ var _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
+ if (_PurchaseInventory.Count == 0)
+ {
+ //鏃犻噰璐鍗曠洿鎺ヤ笅涓�涓墿鏂�
+ sql = $"INSERT INTO JIT_TLPLANERROR(HROGID,HUSERID,HWORKSHOPID,HDAYPLANID,HDAYPLANENTRYID,HMATERIALID,HQTY,HTYPE) VALUES({fPrdOrgId},{user},{fProWorkShopId},{_item.FID},{_item.FENTRYID},{_item.FMATERIALID},{_item.NeedQty},0) ";
+ sqlList.Add(sql);
+ break;
+ }
+ //闇�姹傛暟閲�
+ NeedQty = _item.NeedQty;
+ //澧炲姞涓�涓攢鍞鍗曞彿鍖归厤鐨勯�昏緫 浼樺厛寰幆
+ var PurchaseInventoryBySalOrder = _PurchaseInventory.Where(x => x.FXQD == _item.FXQD).OrderBy(x => x.FENTRYID).ToList();
+ if (PurchaseInventoryBySalOrder.Count > 0)
+ {
+ foreach (var Purchase in PurchaseInventoryBySalOrder)
+ {
+ double _FFIXLEADTIME = Purchase.FFIXLEADTIME;//鎻愬墠鏈�
+ DateTime _DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-_FFIXLEADTIME);
+ if (Purchase.FQTY >= NeedQty)
+ {
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = _item.FID,
+ FHMASTERDATE = _DATE,
+ FQty = NeedQty,
+ FBILLNO = _item.FBILLNO,
+ FENTRYID = _item.FENTRYID,
+ FMATERIALID = _item.FMATERIALID,
+ FNumber = _item.FNumber,
+ OLDDATE = _item.FHMASTERDATE,
+ FFIXLEADTIME = _FFIXLEADTIME,
+ FErpClsID = _item.FErpClsID,
+ FWORKSHOPNUMBER = _item.FWORKSHOPNUMBER,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO,
+
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+
+ });
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ _item.NeedQty = 0;
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ Purchase.FQTY -= NeedQty;
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+ //闇�姹傛暟閲忓彉涓�0
+ NeedQty = 0;
+ break;
+ }
+ else//閲囪喘璁㈠崟鏁版嵁涓嶈兘婊¤冻璁㈠崟鎵�闇�鏁伴噺
+ {
+ //閲囪喘璁㈠崟鏁伴噺
+ decimal _NeedQty = Purchase.FQTY;
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = _item.FID,
+ FHMASTERDATE = _DATE,
+ FQty = _NeedQty,
+ FBILLNO = _item.FBILLNO,
+ FENTRYID = _item.FENTRYID,
+ FMATERIALID = _item.FMATERIALID,
+ FNumber = _item.FNumber,
+ OLDDATE = _item.FHMASTERDATE,
+ FFIXLEADTIME = _FFIXLEADTIME,
+ FErpClsID = _item.FErpClsID,
+ FWORKSHOPNUMBER = _item.FWORKSHOPNUMBER,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO,
+
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+ });
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Purchase.FQTY}' where FENTRYID = {Purchase.FENTRYID}");
+ //鏇存柊璁㈠崟闇�姹傛暟閲�
+ NeedQty = NeedQty - Purchase.FQTY;
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ _item.NeedQty -= _NeedQty;
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ Purchase.FQTY = 0;
+ }
+ }
+ }
+ if (NeedQty == 0)
+ continue;
+ var PurchaseInventoryElse = _PurchaseInventory.Where(x => x.FXQD != _item.FXQD).OrderBy(x => x.FENTRYID).ToList();
+ foreach (var Purchase in PurchaseInventoryElse)
+ {
+ double _FFIXLEADTIME = Purchase.FFIXLEADTIME;//鎻愬墠鏈�
+ DateTime _DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-_FFIXLEADTIME);
+ if (Purchase.FQTY >= NeedQty)
+ {
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = _item.FID,
+ FHMASTERDATE = _DATE,
+ FQty = _item.NeedQty,
+ FBILLNO = _item.FBILLNO,
+ FENTRYID = _item.FENTRYID,
+ FMATERIALID = _item.FMATERIALID,
+ FNumber = _item.FNumber,
+ OLDDATE = _item.FHMASTERDATE,
+ FFIXLEADTIME = _FFIXLEADTIME,
+ FErpClsID = _item.FErpClsID,
+ FWORKSHOPNUMBER = _item.FWORKSHOPNUMBER,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO,
+
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+ });
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount =isnull(FPODemandPlanCount,0)+ '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ _item.NeedQty = 0;
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ Purchase.FQTY -= NeedQty;
+ //闇�姹傛暟閲忓彉涓�0
+ NeedQty = 0;
+ break;
+ }
+ else//閲囪喘璁㈠崟鏁版嵁涓嶈兘婊¤冻璁㈠崟鎵�闇�鏁伴噺
+ {
+ //鏇存柊鎬婚渶姹傛暟閲�
+ NeedQty = NeedQty - Purchase.FQTY;
+ //閲囪喘璁㈠崟鏁伴噺
+ decimal _NeedQty = Purchase.FQTY;
+ PODemandPlanTemp.Add(new PODemandPlanTemp
+ {
+ FID = _item.FID,
+ FHMASTERDATE = _DATE,
+ FQty = _NeedQty,
+ FBILLNO = _item.FBILLNO,
+ FENTRYID = _item.FENTRYID,
+ FMATERIALID = _item.FMATERIALID,
+ FNumber = _item.FNumber,
+ OLDDATE = _item.FHMASTERDATE,
+ FFIXLEADTIME = _FFIXLEADTIME,
+ FErpClsID = _item.FErpClsID,
+ FWORKSHOPNUMBER = _item.FWORKSHOPNUMBER,
+ FDAYPLANBILLNO = _item.FDAYPLANBILLNO,
+
+ PurchseFentryID = Purchase.FENTRYID,
+ FSUPPLIERID = Purchase.FSUPPLIERID,
+ PurchseFNUMBER = Purchase.FNUMBER,
+ PurchseFBillNo = Purchase.FBillNo,
+ PurchseFqty = Purchase.FQTY,
+ FStockOrgId = Purchase.FStockOrgId, //閲囪喘缁勭粐
+ FORGNumber = Purchase.FORGNumber,
+ FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
+
+ FXQD = _item.FXQD,
+ FCREATORID = Purchase.FCREATORID,
+ FName = Purchase.FName,
+ FDate = Purchase.FDate,
+ FDeliveryDate = Purchase.FDeliveryDate,
+ F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
+ FNOTE = Purchase.FNOTE,
+ FPURCHASEQTY = Purchase.FPURCHASEQTY,
+ FJOINQTY = Purchase.FJOINQTY
+ });
+ //鏇存柊閲囪喘璁㈠崟
+ //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Purchase.FQTY}' where FENTRYID = {Purchase.FENTRYID}");
+ //鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
+ _item.NeedQty -= _NeedQty;
+ //鎵ｉ櫎褰撳墠琛屽搴旈噰璐鍗曟暟閲�
+ Purchase.FQTY = 0;
+ }
+ }
+ if (NeedQty > 0)
+ {
+ sql = $"INSERT INTO JIT_TLPLANERROR(HROGID,HUSERID,HWORKSHOPID,HDAYPLANID,HDAYPLANENTRYID,HMATERIALID,HQTY,HTYPE,HERRORTYPE) VALUES({fPrdOrgId},{user},{fProWorkShopId},{_item.FID},{_item.FENTRYID},{_item.FMATERIALID},{NeedQty},0,1) ";
+ sqlList.Add(sql);
+ }
+ }
+ }
+
+ //渚涘簲鍟嗭紝鎻愭枡鏃ユ湡锛岀敓浜ц溅闂达紝閲囪喘鍛� 鍒嗙粍
+ var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE, p.FWORKSHOPNUMBER, p.FCREATORID }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE, FWORKSHOPNUMBER = x.Key.FWORKSHOPNUMBER, FCREATORID = x.Key.FCREATORID }).ToList();
+
+ LogService.Write("鎻愭枡璁″垝閲嶇畻 锛屾暟鎹噯澶囧畬鎴愶紝淇濆瓨鍒癕odel瀹炰綋 鐢ㄦ椂锛�" + sw.Elapsed + "鎬昏鏁帮細" + PODemandPlanTemp.Count);
+
+ int tlmmm = 0;
+ JArray FinalyResult = new JArray();
+ foreach (var item in PODemandPlanList)
+ {
+ tlmmm++;
+
+ DateTime date = item.FHMASTERDATE;
+ long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
+
+ var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
+ inner join " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
+ where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Supplier");
+ long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //渚涘簲鍟�
+
+ var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
+ string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//鍒跺崟浜�
+ string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//淇敼浜�
+
+ var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //閲囪喘缁勭粐
+
+ string PurchseFNUMBER = item.PurchseFNUMBER;
+ string FWorkshopNumber = item.FWORKSHOPNUMBER;
+ string FCreatorID = item.FCREATORID;
+
+ var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
+ var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //涓昏〃
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
+ ",HBillSubType,HDate,HBillStatus,HMaker,HMakeDate" +
+ ",HSubORGID ,HAddress,HPURCHASEORGID,HSupplierID ,HSettleCurrId" +
+ ",HRemark,HExplanation,HUpDater,HUpDateDate)" +
+ $"values({HInterID}, '{HBillNo}', {DateTime.Now.Year}, {DateTime.Now.Month}, '4608'" +
+ $", '4608','{date}',1, '{HMaker}',GETDATE()," +
+ $"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
+ $",'','','{HUpDater}',getdate())");
+
+ List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER && x.FWORKSHOPNUMBER == FWorkshopNumber && x.FCREATORID == FCreatorID).ToList();
+ int i = 0;
+ foreach (var _item in _PODemandPlanList)
+ {
+ i++;
+
+ var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
+ inner join " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ where FNUMBER='" + _item.FNumber + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Material");
+ string HMaterID = "0"; //鐗╂枡
+ string HMaterModel = ""; //鐗╂枡浠ｇ爜
+ string HMaterName = ""; //鐗╂枡鍚嶇О
+ if (dataSet.Tables[0].Rows.Count != 0)
+ {
+ HMaterID = dataSet.Tables[0].Rows[0]["HItemID"].ToString(); //鐗╂枡
+ HMaterModel = dataSet.Tables[0].Rows[0]["HNumber"].ToString(); //鐗╂枡浠ｇ爜
+ HMaterName = dataSet.Tables[0].Rows[0]["HName"].ToString(); //鐗╂枡鍚嶇О
+ }
+
+ decimal HQty = _item.FQty; //鏁伴噺
+ long HSourceInterID = _item.FID; //鏃ヨ鍒掑伐鍗旻ID
+ long HSourceEntryID = _item.FENTRYID;//鏃ヨ鍒掑伐鍗旻ENTRYID
+ string HSourceBillNo = _item.FBILLNO; //鐢熶骇璁㈠崟鍙�
+ string HSourceBillType = ""; //鏃ヨ鍒掑伐鍗曠被鍨�
+ DateTime HDayPlanDate = _item.OLDDATE; // 宸ュ崟鐢熶骇鏃ユ湡
+ decimal HRelationQty = _item.PurchseFqty; // 鍏宠仈鏁伴噺
+ double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
+
+ dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
+ inner join " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ where FNUMBER='" + _item.FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
+ long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // 閲囪喘缁勭粐
+ long HPOOrderInterID = _item.PurchseFID; // 閲囪喘璁㈠崟鍐呯爜
+ long HPOOrderEntryID = _item.PurchseFentryID; // 閲囪喘璁㈠崟瀛愬唴鐮�
+ string HPOOrderBillNo = _item.PurchseFBillNo; // 閲囪喘璁㈠崟鍙�
+ string HErpClsID = _item.FErpClsID; // 鐗╂枡灞炴��
+ long HUnitID = 10101; // 璁￠噺鍗曚綅 鍏堟寜鐓ф湰鍦版潵 榛樿 Pcs
+ string HSeOrderBillNo = _item.FXQD; // 閿�鍞鍗曞彿 闇�姹傚崟鍙�
+ string HOrderEmpID = _item.FCREATORID; // 閲囪喘鍛�
+ DateTime HPOOrderBillDate = _item.FDate; // 閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+ DateTime HPOOrderBillDeliveryDate = _item.FDeliveryDate; // 閲囪喘璁㈠崟浜よ揣鏃ユ湡
+ string HPOOrderBillRemark = _item.F_QIMB_NOTE; // 閲囪喘璁㈠崟鎽樿
+ string HPOOrderBillNote = _item.FNOTE; // 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FWORKSHOPNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
+ string HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 鐢熶骇杞﹂棿
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
+ inner join " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
+ string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 閲囪喘閮ㄩ棬
+
+ decimal HPURCHASEQTY = _item.FPURCHASEQTY; // 閲囪喘璁㈠崟鏁伴噺
+ decimal HJoinQty = _item.FJOINQTY; // 閲囪喘璁㈠崟鍏宠仈鏁伴噺
+
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
+ ", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
+ ", HPURCHASEORGID, HStatus, HFixleadTime, HDayPlanBillNo, HSourceInterID" +
+ ", HSourceEntryID, HSourceBillNo, HSourceBillType, HWorkShopID, HDayPlanDate" +
+ ", HRelationQty1, HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HPOOrderBillSEQ" +
+ ", HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo, HPurchaseDeptID, HCloseTypeSub" +
+ ", HCloseMan, HEntryCloseDate, HSendQty, HReciveQty, HCloseStatus" +
+ ", HRemoveQty, HSeOrderBillNo, HUnReciveQty, HPOOrderBillDate, HPOOrderBillDeliveryDate" +
+ ", HPOOrderBillRemark, HPOOrderBillNote)" +
+ $"values({HInterID}, {i}, '', {(HMaterID == null ? "0" : HMaterID)}, '{HMaterName}'" +
+ $", '{HMaterModel}', {HUnitID}, '{HErpClsID}', {HQty}, ''" +
+ $", {HPURCHASEORGIDSub}, '', {HFixleadTime}, '{HDayPlanBillNo}', {HSourceInterID}" +
+ $", {HSourceEntryID}, '{HSourceBillNo}', '{HSourceBillType}', {HWorkShopID}, '{HDayPlanDate}'" +
+ $", {HRelationQty}, {HPOOrderInterID},{HPOOrderEntryID}, '{HPOOrderBillNo}',0" +
+ $",0,0, '',{HPurchaseDeptID}, '0'" +
+ $", '','',0,0, '0'" +
+ $",0, '{HSeOrderBillNo}',0, '{HPOOrderBillDate}', '{HPOOrderBillDeliveryDate}'" +
+ $", '{HPOOrderBillRemark}', '{HPOOrderBillNote}')");
+ }
+ }
+
+ if (tlmmm == PODemandPlanList.Count)
+ {
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩愮畻鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩愮畻澶辫触!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
+ oCN.RollBack();//浜嬪姟鍥炴粴
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillHLockedDay(int HLockedDay,int HWorkShopID)
+ {
+ try
+ {
+ oCN.RunProc("update b set HLockedSub=0 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where a.HWorkShopID={HWorkShopID}");
+
+ oCN.RunProc("update b set HLockedSub=1 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where HMasterDate between DATEADD(day, -1, getdate()) " +
+ $"and DATEADD(day,{(HLockedDay - 1)},getdate()) and a.HWorkShopID={HWorkShopID}");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -1127,15 +2433,13 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑙ｉ攣
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockDay")]
[HttpGet]
- public object JIT_DayPlanPlatFormBillHUnlockDay(string sWhere, int HLockedDay)
+ public object JIT_DayPlanPlatFormBillHUnlockDay(int HWorkShopID)
{
try
{
- if (sWhere != null && sWhere != "")
- {
- oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=0" +
- $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
- }
+ oCN.RunProc("update b set HLockedSub=0 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where a.HWorkShopID={HWorkShopID}");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -1156,31 +2460,67 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鐢熶骇璁㈠崟鏌ヨ
[Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillList")]
[HttpGet]
- public object JIT_ICMOBillList(string hmainid, string HEntryID)
+ public object JIT_ICMOBillList(string hmainid)
{
try
{
- DataSet dt = new DataSet();
- oCN.RunProc("exec h_p_ICMOBillList_PrimarySubTable");
- ds = oCN.RunProcReturn($"select * from ##ICMOBillList where 婧愬崟涓诲唴鐮� in({hmainid}) and 婧愬崟瀛愬唴鐮� in({HEntryID})", "##ICMOBillList");
-
- for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ var list = hmainid.Split(',');
+ List<DataTable> listdt = new List<DataTable>();
+ DataTable dtable = new DataTable("dt");
+ for (int i = 0; i < list.Length; i++)
{
- dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[i]["婧愬崟涓诲唴鐮�"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[i]["婧愬崟瀛愬唴鐮�"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
+ var listEvery = list[i].Split('_');
+
+ ds = oCN.RunProcReturn($"exec h_p_ICMOBillList_PrimarySubTable '{listEvery[0]}','{listEvery[1]}'", "h_p_ICMOBillList_PrimarySubTable");
+
+ var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["婧愬崟涓诲唴鐮�"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["婧愬崟瀛愬唴鐮�"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
if (dt.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:"+ ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString()+",鏄庣粏琛屽彿:"+ ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString() + ",鏄庣粏琛屽彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
objJsonResult.data = null;
return objJsonResult;
}
+ if (i == 0)
+ {
+ //娣诲姞鍒楀悕
+ for (int j = 0; j < ds.Tables[0].Columns.Count; j++)
+ {
+ dtable.Columns.Add(ds.Tables[0].Columns[j].ToString());
+ }
+ }
+ listdt.Add(ds.Tables[0]);
}
-
+
+ //鑾峰彇闆嗗悎鏁版嵁
+ for (int i = 0; i < listdt.Count; i++)
+ {
+ DataRow row = dtable.NewRow();
+ for (int j = 0; j < listdt[i].Columns.Count; j++)
+ {
+ if (listdt[i].Columns[j].ColumnName == "璁″垝鏁伴噺")
+ {
+ row[j] = double.Parse(listdt[i].Rows[0][j].ToString()).ToString();
+ }
+ else
+ {
+ row[j] = listdt[i].Rows[0][j].ToString();
+ }
+ }
+ dtable.Rows.Add(row);
+ }
+
+ //娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 31; j++)
+ {
+ dtable.Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = dtable;
return objJsonResult;
}
catch (Exception e)
--
Gitblit v1.9.1