From 89e44d60763512c3d9130542554c6d2d07d6269a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 24 七月 2023 08:56:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 637 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 555 insertions(+), 82 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 df85a12..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"
@@ -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")]
@@ -41,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;
@@ -285,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())
@@ -760,21 +763,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 ,a.FLOT HLOT,a.FID HInventoryFID
-from
-(
-select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
-join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
-join AIS20230129011339..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
-LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
-join AIS20230129011339..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
-) T1
-JOIN AIS20230129011339..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
-LEFT JOIN AIS20230129011339..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
-LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20230129011339..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
-join AIS20230129011339..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(@"
@@ -786,28 +776,13 @@
//鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜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 AIS20230129011339..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
-LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
-LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
-LEFT JOIN AIS20230129011339..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>();
+ 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>();
//鍒涘缓瀛楀吀 鐢ㄤ簬鍌ㄥ瓨鐗╂枡 + 鍗犵敤鏁伴噺
@@ -816,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();
//姣忎竴涓墿鏂欒繘琛屽簱瀛樿绠�
@@ -853,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)
{
//棰嗘枡鏁伴噺婊¤冻浜嗗綋鍓嶈繖涓渶姹傞噺 鐩存帴榻愬 涓嶉渶瑕佸幓鍗犵敤浠撳簱
@@ -885,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)
@@ -930,6 +914,8 @@
//缁堟璇ョ墿鏂欒绠� 杩涘叆涓嬩竴涓�
continue;
}
+
+ LogService.Write($"k" + 2);
foreach (var WorkHouse in _pRD_WorkHouseCompar)
{
//搴撳瓨鏁版嵁鍖归厤
@@ -1226,6 +1212,8 @@
/// 搴撳瓨缁勭粐
/// </summary>
public long FStockOrgId { get; set; }
+ //搴撳瓨缁勭粐鍚嶇О
+ public string FStockOrgName { get; set; }
/// <summary>
/// jit鐗╂枡鍒嗙被
/// </summary>
@@ -1299,6 +1287,10 @@
/// 閲囪喘缁勭粐
/// </summary>
public long FStockOrgId { get; set; }
+ /// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
/// <summary>
/// 缁勭粐缂栫爜
/// </summary>
@@ -1440,6 +1432,10 @@
/// </summary>
public long FStockOrgId { get; set; }
/// <summary>
+ /// 閲囪喘缁勭粐鍚嶇О
+ /// </summary>
+ public string FStockOrgName { get; set; }
+ /// <summary>
/// 缁勭粐缂栫爜
/// </summary>
public string FORGNumber { get; set; }
@@ -1503,15 +1499,65 @@
[Route("JIT_DayPlanPlatFormBill/JIT_TLYS")]
[HttpGet]
- public object JIT_TLYS(string sWhere, string user)
+ public object JIT_TLYS(string sWhere, string user,string HTLType)
{
try
{
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
- DataSet DaSet = oCN.RunProcReturn($"select * from JIT_MOMaterReadysBill where HWorkShopID={omdelMian.HWorkShopID} and HProdORGID={omdelMian.HProdORGID}", "JIT_MOMaterReadysBill");
+ string fProWorkShopId = omdelMian.HWorkShopID.ToString();
+ var fPrdOrgId = omdelMian.HProdORGID;
+ string sqlName = "";//AIS20210811135644
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉")
+ {
+ sqlName = "AIS20230129011339";
+ }
+ else
+ {
+ sqlName = "AIS20210811135644";
+ }
+ }
- if (DaSet.Tables[0].Rows.Count == 0)
+ 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;
@@ -1520,12 +1566,460 @@
return objJsonResult;
}
- string fProWorkShopId = omdelMian.HWorkShopID.ToString();
- var fPrdOrgId = omdelMian.HProdORGID;
+ //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>();
- LogService.Write($"鎻愭枡璁″垝閲嶇畻 杞﹂棿锛歿fProWorkShopId}锛岀粍缁囷細{fPrdOrgId}");
+ LogService.Write("1");
+ 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;
+ }
+
+ LogService.Write("1.1");
+
+ ////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
+
+ LogService.Write("1.2");
+
+ 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;
+ }
+
+ LogService.Write("1.2.1");
+
+ if (NeedQty == 0)
+ {
+ DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
+ }
+ FEntryIdList.Add(_item.FENTRYID);
+ NeedQty += _item.NeedQty;
+ //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)
+ {
+ 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;
+ }
+
+ LogService.Write("1.2.3");
+
+ 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);
+ }
+ }
+ }
+
+ 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++;
+
+ 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++;
+ }
+
+ 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 = "杩愮畻鎴愬姛!" + Error;
+ 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();//寮�濮嬭鏃�
//鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺 骞朵笖鏌ヨ鍑洪渶瑕佽繘琛岃繍绠楃殑鏁版嵁
@@ -1548,32 +2042,13 @@
//t2.FXQD t2.FSTOCKINQTY,t2.FReceiveQty 鏈湴娌℃湁杩欎簺瀛楁
string sql = string.Format(@"
- /*dialect*/
-select t4.FSTOCKINQTY,t4.FReceiveQty,t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount)FQTY
-,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FCloseStatus,FMRPCLOSESTATUS,FPURCHASEDEPTID,t7.FNUMBER as FPURCHASEDEPTNUMBER
-,t1.FCREATORID,t8.FName ,t1.FDate,tD.FDeliveryDate,t2.FNOTE,(t4.FReceiveQty - t4.FSTOCKINQTY) as FReceiveNotInQty,'' FXQD,T2.FQTY AS FPURCHASEQTY,FJOINQTY,
-isnull((select top 1 HLeadTime + HLeadTime_Sec from Cg_PODemandPlanConfigBillMain a
-join Cg_PODemandPlanConfigBillSub b on a.HInterID =b.HInterID
-left join Xt_ORGANIZATIONS o on a.HOrgID=o.HItemID
-left join Gy_Supplier s on b.HSupplierID=s.HItemID
- where o.HNumber = t5.FNUMBER and s.HNumber = t3.FNUMBER), 0)FFIXLEADTIME
-from AIS20230129011339..t_PUR_POOrder t1
-join AIS20230129011339..t_PUR_POOrderEntry t2 on t1.FID = t2.FID
-join AIS20230129011339..t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
-join AIS20230129011339..T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
-join AIS20230129011339..T_PUR_POORDERENTRY_D tD on t2.FENTRYID = tD.FENTRYID
-join AIS20230129011339..T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
-join AIS20230129011339..T_SEC_user t8 on t1.FCREATORID = t8.FuserId
-join AIS20230129011339..T_BD_DEPARTMENT T7 ON t1.FPURCHASEDEPTID = T7.FDEPTID
-where t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount>0
-and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
-and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
-and FPurchaseOrgId = '{0}'
-", fPrdOrgId);
+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, "PurchaseInventoryList");
+ ds = oCN.RunProcReturn(sql, "h_v_jit_POOrderList");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count == 0)
+ {
oCN.RollBack();//鍥炴粴浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1833,29 +2308,29 @@
foreach (var item in PODemandPlanList)
{
tlmmm++;
-
+
DateTime date = item.FHMASTERDATE;
long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
- var dataSup= oCN.RunProcReturn(@"select * from Gy_Supplier p
- inner join AIS20230129011339..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
- where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='"+ fPrdOrgId + "'", "Gy_Supplier");
+ 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 AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ 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 FWorkshopNumber = item.FWORKSHOPNUMBER;
string FCreatorID = item.FCREATORID;
- var HInterID= DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
+ 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" +
@@ -1867,7 +2342,6 @@
$"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
$",'','','{HUpDater}',getdate())");
- JArray Fentity = new JArray();
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)
@@ -1875,7 +2349,7 @@
i++;
var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
- inner join AIS20230129011339..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ 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 = ""; //鐗╂枡浠ｇ爜
@@ -1897,7 +2371,7 @@
double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
- inner join AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ 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; // 閲囪喘璁㈠崟鍐呯爜
@@ -1913,13 +2387,13 @@
string HPOOrderBillNote = _item.FNOTE; // 閲囪喘璁㈠崟琛ㄤ綋澶囨敞
string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
- dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
- inner join AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ 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 AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ 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(); // 閲囪喘閮ㄩ棬
@@ -1965,7 +2439,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
}
catch (Exception e)
{
--
Gitblit v1.9.1