From 20e583035f94edaba23d88e43c37e02088f07bea Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 16 二月 2021 17:04:13 +0800
Subject: [PATCH] 生产计划平台 选单功能修改 将生产订单数量 自动填充到 日计划中 规则为 明细行的开工日期 即为 日计划日期 2h
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 1
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 273 ++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 204 insertions(+), 70 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index ade1519..aa04ac6 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -161,7 +161,6 @@
fCloseCount = dayPlanDt.Rows[0]["FCloseCount"].ToString();
fQtyLS = dayPlanDt.Rows[0]["FQTYLS"].ToString();
}
- //DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
this.Model.SetValue("FMoFBillType", FMoFBillType, i);
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 622e44d..4cf0488 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -384,16 +384,7 @@
string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
sqlList.Add(sql);
int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
- //if (result > 0)
- //{
- //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
DayPlanPPBomBill();
- //Extraction();
- //SearchList();
-
- //}
- //else
- // this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
/// <summary>
/// 瑙ｉ攣
@@ -442,49 +433,175 @@
}
foreach (DynamicObject current in entityDataObjoct)
{
- JObject jsonRoot = new JObject();
- jsonRoot.Add("Creator", "");
- jsonRoot.Add("NeedUpDateFields", new JArray());
- jsonRoot.Add("NeedReturnFields", new JArray());
- jsonRoot.Add("IsDeleteEntry", "false");
- jsonRoot.Add("SubSystemId", "");
- jsonRoot.Add("IsVerifyBaseDataField", "");
- JObject jsonModel = new JObject();
- jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"]));
- jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"]));
- jsonModel.Add("FDayPlanQuantity", Convert.ToDecimal(current["FDayPlanQuantity"]) + Convert.ToDecimal(current["FQTYLS"]));
- jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"]));
- sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanWorkID"])} ";
- List<DayPlanModel> dayPlanModel = new List<DayPlanModel>();
- dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>();
- JArray Entry = new JArray();
- for (int i = 0; i <= 60; i++)
+ if (Convert.ToInt32(current["FDayPlanWorkID"]) > 0)
{
- if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
- continue;
- JObject jsonFPOOrderEntry = new JObject();
- jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
- jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
- List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList();
- if (_dayPlanModel.Count > 0)
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "false");
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"]));
+ jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"]));
+ jsonModel.Add("FDayPlanQuantity", Convert.ToDecimal(current["FDayPlanQuantity"]) + Convert.ToDecimal(current["FQTYLS"]));
+ jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"]));
+ sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanWorkID"])} ";
+ List<DayPlanModel> dayPlanModel = new List<DayPlanModel>();
+ dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>();
+ JArray Entry = new JArray();
+ for (int i = 0; i <= 60; i++)
{
- jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
+ JObject jsonFPOOrderEntry = new JObject();
+ jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
+ jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
+ List<DayPlanModel> _dayPlanModel = dayPlanModel.Where(x => x.FHMASTERDATE == date.AddDays(i)).ToList();
+ if (_dayPlanModel.Count > 0)
+ {
+ jsonFPOOrderEntry.Add("FEntryID", _dayPlanModel.FirstOrDefault().FEntryID); ;//搴忓彿
+ }
+ Entry.Add(jsonFPOOrderEntry);
}
- Entry.Add(jsonFPOOrderEntry);
+ jsonModel.Add("FEntity", Entry);
+ jsonRoot.Add("Model", jsonModel);
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ if (saveIsSuc != "TRUE")
+ {
+ LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
+ this.View.ShowMessage("鏁版嵁鍌ㄥ瓨澶辫触锛佽鑱旂郴绠＄悊鍛橈紒");
+ }
}
- jsonModel.Add("FEntity", Entry);
- jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
- var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
- JObject saveObj = JObject.Parse(result);
- string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- if (saveIsSuc != "TRUE")
+ else
{
- LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
- this.View.ShowMessage("鏁版嵁鍌ㄥ瓨澶辫触锛佽鑱旂郴绠＄悊鍛橈紒");
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"
+/*dialect*/
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber,tBom.FNUMBER as FBomNumber FROM T_PRD_MO T1
+ LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
+ LEFT JOIN T_ENG_BOM tBom on t2.FBOMID = tBom.FID
+ join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
+ join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
+ WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ DataTable dt = new DataTable();
+ dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count == 0)
+ continue;
+ string FID = "";//FID 婧愬崟涓诲唴鐮�
+ string FENTRYID = "";//FENTRYID 婧愬崟瀛愬唴鐮�
+ string FLOT = "";//FLOT 鎵规
+ string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
+ string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FHUnitID = "";//鍗曚綅
+ string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+ string FPlanEndDate = "";//缁撴潫鏃ユ湡
+ string FMoFBillType = "";//
+ string FBomNumber = "";//Bom 鐗堟湰
+ if (dt.Rows.Count > 0)
+ {
+ FID = dt.Rows[0]["FID"].ToString();
+ FENTRYID = dt.Rows[0]["FENTRYID"].ToString();
+ FLOT = dt.Rows[0]["FLOT"].ToString();
+ FQTY = dt.Rows[0]["FQTY"].ToString();
+ FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
+ FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+ FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+ FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
+ FMoFBillType = dt.Rows[0]["FMoFBillType"].ToString();
+ FBomNumber = dt.Rows[0]["FBomNumber"].ToString();
+ }
+
+ //閫夊崟鏁版嵁 鍋氭柊澧�
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "false");
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
+ jsonModel.Add("FMoFBillType", FMoFBillType);//
+ jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
+ jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
+ jsonModel.Add("FHOrderLev", current["FOrderLevel"].ToString());//璁㈠崟绛夌骇
+ jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
+ jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
+ jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
+ jsonModel.Add("FBOMID", new JObject() { ["Fnumber"] = FBomNumber });//BOM鐗堟湰
+ jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
+ //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
+ jsonModel.Add("FBatch", FLOT);//鎵规
+ jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
+ jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
+ jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
+ jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
+ jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
+ JObject jsonFHMaterID = new JObject();
+ jsonFHMaterID.Add("FNumber", (current["FMatrailId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHMaterID", jsonFHMaterID);//FHMaterID 鐗╂枡
+ if (Convert.ToString(current["FORGID_Id"]) != "0")
+ {
+ JObject jsonFHPRDORGID = new JObject();
+ jsonFHPRDORGID.Add("FNumber", (current["FORGID"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 鐢熶骇缁勭粐
+
+ }
+ if (Convert.ToString(current["FResourcesId_Id"]) != "0")
+ {
+ JObject jsonFProductWorkShopId = new JObject();
+ jsonFProductWorkShopId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHSourceID", jsonFProductWorkShopId);//FHSourceID 鐢熶骇杞﹂棿
+ }
+ if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
+ {
+ JObject jsonFResourcesId = new JObject();
+ jsonFResourcesId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
+ jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID 鐢熶骇璧勬簮
+ }
+ JArray Entry = new JArray();
+ for (int i = 0; i <= 60; i++)
+ {
+ if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
+ continue;
+ JObject jsonFPOOrderEntry = new JObject();
+ jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
+ jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
+ Entry.Add(jsonFPOOrderEntry);
+ }
+ jsonModel.Add("FEntity", Entry);
+ jsonRoot.Add("Model", jsonModel);
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ if (saveIsSuc != "TRUE")
+ {
+ LogHelper.Error("鐢熶骇璁″垝骞冲彴淇濆瓨澶辫触:" + jsonRoot.ToString());
+ this.View.ShowMessage("鏁版嵁鍌ㄥ瓨澶辫触锛佽鑱旂郴绠＄悊鍛橈紒");
+ }
+ if (saveIsSuc == "TRUE")
+ {
+ string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
+ string FDayPlanID = saveObj["Result"]["Id"].ToString();
+ this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"]) - 1);//
+ this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);//
+ }
}
}
-
this.View.ShowMessage("鎿嶄綔鎴愬姛");
SearchList();
}
@@ -515,11 +632,12 @@
// using Kingdee.BOS.KDThread;
MainWorker.QuequeTask(() =>
{
+ var resuult = "";
try
{
// 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
// 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- this.CompleteSetAnalysisByDataTable();
+ resuult = this.CompleteSetAnalysisByDataTable();
}
finally
{
@@ -531,6 +649,7 @@
{
processView.Close();
this.View.SendDynamicFormAction(processView);
+ this.View.ShowMessage(resuult);
}
}
},
@@ -1046,7 +1165,7 @@
{
Stopwatch sw = new Stopwatch();
sw.Start();//寮�濮嬭鏃�
- //娓呯┖榻愬涓存椂琛�
+ //娓呯┖榻愬涓存椂琛�
DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBill ");
//鏇存柊鐘舵��
DBServiceHelper.Execute(Context, "/*dialect*/ update Sc_WorkBillSortBillsub set FCOMPLETE='' ");
@@ -1254,7 +1373,7 @@
}
}
- public void CompleteSetAnalysisByDataTable()
+ public string CompleteSetAnalysisByDataTable()
{
LogHelper.Info("榻愬鍒嗘瀽sql妯″紡寮�濮嬪噯澶囨暟鎹細");
string sql = "";
@@ -1456,16 +1575,13 @@
insertDT.Columns.Add("FPRDBILLNO", typeof(string));
insertDT.Columns.Add("FOWNERID", typeof(long));
insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
-
//insertDT.Columns.Add("FIDENTIFICAT", typeof(long));
-
insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
insertDT.Columns.Add("FCOMPLETE", typeof(string));
insertDT.Columns.Add("FLACKCOUNT", typeof(decimal));
insertDT.Columns.Add("FOCCUPYCOUNT", typeof(decimal));
insertDT.Columns.Add("FCOMPLETECOUNT1", typeof(decimal));
insertDT.Columns.Add("FERPCLSID", typeof(string));
-
int jdtmmm = 1;
foreach (var item in completeAnalysisTempModel)
{
@@ -1487,9 +1603,7 @@
dr["FPRDBILLNO"] = item.FPRDBillNo;
dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
dr["FOWNERTYPEID"] = "BD_OwnerOrg";
-
//dr["FIDENTIFICAT"] = "";
-
dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
dr["FCOMPLETE"] = item.FComPlete;
dr["FLACKCOUNT"] = item.FLackCount;
@@ -1513,10 +1627,12 @@
");
sw.Stop();//缁撴潫璁℃椂
LogHelper.Info("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ return "鎿嶄綔鎴愬姛";
}
catch (Exception ex)
{
LogHelper.Error("榻愬鍒嗘瀽璺冲嚭锛�" + ex.Message.ToString());
+ return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
}
}
@@ -2012,11 +2128,12 @@
// using Kingdee.BOS.KDThread;
MainWorker.QuequeTask(() =>
{
+ var result = "鎿嶄綔鎴愬姛";
try
{
// 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
// 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- this.DayPlanPPBomBillBatch();
+ result = this.DayPlanPPBomBillBatch();
}
finally
{
@@ -2028,20 +2145,23 @@
{
processView.Close();
this.View.SendDynamicFormAction(processView);
- this.View.ShowMessage("鎿嶄綔鎴愬姛");
+ this.View.ShowMessage(result);
}
}
},
(t) => { });
+
+ //this.View.ShowMessage("鎿嶄綔鎴愬姛");
}
/// <summary>
/// 鏃ヨ鍒掔敤鏂欐竻鍗曠敓鎴�
/// </summary>
- public void DayPlanPPBomBillBatch()
+ public string DayPlanPPBomBillBatch()
{
//LogService.WriteAsync(entrys);
//鏌ユ壘鍒扮殑鍚屾壒椤规
+ int day = Convert.ToInt32(this.Model.GetValue("FLockDays"));
Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
@@ -2098,10 +2218,18 @@
LEFT join T_ORG_Organizations t10 on t2.FHPRDORGID = t10.FORGID
LEFT join T_ENG_WORKCENTER t11 on t2.FHSOURCEID = t11.FID
left join T_BD_DEPARTMENT td on t3.FWORKSHOPID=td.FDEPTID
- WHERE t1.FEntryID not in
+ WHERE
+t1.FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{{1} - 1},getdate())
+and t1.FEntryID not in
(
-select distinct FDAYPLANFID from Sc_DayPlanPPBomBillMain where FID IN (
-select distinct FDAYPLANFID from T_PRD_PICKMTRLDATA)
+select distinct FDAYPLANFID from Sc_DayPlanPPBomBillMain where FID IN
+(
+--棰嗘枡鍗�
+select distinct FDAYPLANFID from T_PRD_PICKMTRLDATA
+union all
+--鏃ヨ鍒掔敤鏂欐竻鍗曞彉鏇村崟
+select distinct FDAYPLANID from Sc_DayPlanPPBomBillSubBG
+)
)
AND {0}
-- and T4.FMustQty>0
@@ -2109,7 +2237,7 @@
-- select FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
-- )
",
-sqlWhere);
+sqlWhere, day);
LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹畇ql:" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable dt = ds.Tables[0];
@@ -2229,6 +2357,7 @@
["IsDeleteEntry"] = "true",
["SubSystemId"] = "",
["IsVerifyBaseDataField"] = "false",
+ ["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
["Model"] = Fentity
};
CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
@@ -2251,9 +2380,10 @@
}
if (saveIsSuc != "TRUE")
{
- LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗曞垪琛ㄧ敓鎴愬け璐�:" + jsonRoot.ToString());
+ //LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗曞垪琛ㄧ敓鎴愬け璐�:" + jsonRoot.ToString());
LogHelper.Error(saveObj.ToString());
- this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
+ return "鎿嶄綔澶辫触锛�" + saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
+ //this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
Fentity = new JArray();
}
@@ -2266,11 +2396,13 @@
}
sw.Stop();//缁撴潫璁℃椂
LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曡繍琛屾�绘椂闀匡細" + sw.Elapsed);
+ return "鎿嶄綔鎴愬姛";
}
catch (Exception ex)
{
LogHelper.Error("鏃ヨ鍒掔敤鏂欐竻鍗�+" + ex.Message.ToString());
- this.View.ShowErrMessage(ex.Message.ToString());
+ return "鎿嶄綔澶辫触锛�" + ex.Message.ToString();
+ //this.View.ShowErrMessage(ex.Message.ToString());
}
}
@@ -2463,8 +2595,8 @@
{
var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
- //if (Qty == 0)
- // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+ //if (Qty == 0)
+ // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
if (Qty > _NeedQty)
Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
@@ -2661,7 +2793,7 @@
FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
- //FentityModel.Add("FSEQ", FSEQ); //鍙戞枡鏂瑰紡
+ //FentityModel.Add("FSEQ", FSEQ); //鍙戞枡鏂瑰紡
FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
Fentity.Add(FentityModel);
@@ -2835,7 +2967,7 @@
lockStockArgs.FID = Convert.ToInt32(current["FHMainSourceInterID"]); //鐢熶骇璁㈠崟琛孖D
lockStockArgs.BaseQty = decimal.Parse(dr["FBASEQTY"].ToString());//鍩烘湰鍗曚綅鏁伴噺
lockStockArgs.BaseUnitID = int.Parse(dr["FBASEUNITID"].ToString());//鍩烘湰鍗曚綅
- //lockStockArgs.Lot = Convert.ToString(current["FBatch"]); ;//鎵规 FBatch
+ //lockStockArgs.Lot = Convert.ToString(current["FBatch"]); ;//鎵规 FBatch
lockStockArgs.MaterialID = long.Parse(dr["FMATERIALID2"].ToString());
lockStockArgs.OwnerID = long.Parse(dr["FOwnerID"].ToString());
lockStockArgs.OwnerTypeID = dr["FOwnerTypeID"].ToString();
@@ -2938,15 +3070,18 @@
{
foreach (var listSelectedRow in listSelectedRowCollection)
{
+ string sql = $"select DATEDIFF(d,FPlanStartDate,getdate())days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
this.Model.CreateNewEntryRow("FEntity");
- this.View.Model.SetValue("FORGID", 100, Fseq);
+ this.View.Model.SetItemValueByNumber("FORGID", "100", Fseq);
this.View.Model.SetValue("FSCOrderNo", listSelectedRow.DataRow["FBillNo"].ToString(), Fseq);
this.View.Model.SetValue("FSRCBILLENTRYSEQ", listSelectedRow.DataRow["t1_FSeq"].ToString(), Fseq);
- this.View.Model.SetValue("FMatrailId", listSelectedRow.DataRow["FMaterialId_Id"].ToString(), Fseq);
+ this.View.Model.SetValue("FMatrailId", listSelectedRow.DataRow["FMaterialId_Id"].ToString(), Fseq);//2129900005
this.View.Model.SetValue("FFUnit", listSelectedRow.DataRow["FUnitId_Id"].ToString(), Fseq);
this.View.Model.SetValue("FOrderQuantity", listSelectedRow.DataRow["FQty"].ToString(), Fseq);
this.View.Model.SetValue("FProductWorkShopId", listSelectedRow.DataRow["FWorkShopID_Id"].ToString(), Fseq);
this.View.Model.SetValue("FOrderLevel", "3", Fseq);
+ this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
Fseq++;
}
}
--
Gitblit v1.9.1