From e651c5637a2a37d3e0a1c2ba052f5996aeeab6d0 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 25 三月 2021 09:53:41 +0800
Subject: [PATCH] 生产日计划导入增加日志记录表
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 899d8ce..3ec2bc4 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -25,7 +25,7 @@
public class Pro_ScDayImport : AbstractDynamicFormPlugIn
{
private string fileFullPath = string.Empty;
-
+
//public override void OnLoad(EventArgs e)
//{
// base.OnLoad(e);
@@ -38,6 +38,7 @@
{
LogHelper.Info("瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳锛�");
ImportData();
+ WriteImportLog();
//this.View.ShowErrMessage("娴嬭瘯瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳");
}
@@ -357,25 +358,20 @@
sql = $" /*dialect*/ select FEntryID, FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} ";
List<DayPlanModel> dayPlanModel = new List<DayPlanModel>();
dayPlanModel = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<DayPlanModel>();
- int fseq = 1;
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 + ""])); ;//鏃ヨ鍒掓暟閲�
jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
- //jsonFPOOrderEntry.Add("FSEQ", fseq); ;//搴忓彿
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);
- fseq++;
}
jsonModel.Add("FEntity", Entry);
jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//婧愬崟缂栧彿
@@ -383,7 +379,6 @@
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- LogHelper.Info(jsonRoot.ToString());
if (saveIsSuc == "TRUE")
{
string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
@@ -398,7 +393,6 @@
}
else
{
- int fseq = 1;
for (int i = 0; i <= 60; i++)
{
if (Convert.ToString(current["FT" + "" + i + ""]) == "" || Convert.ToString(current["FT" + "" + i + ""]) == "0")
@@ -407,16 +401,13 @@
jsonFPOOrderEntry.Add("FHMasterDate", date.AddDays(i).ToShortDateString()); ;//涓绘棩鏈�
jsonFPOOrderEntry.Add("FHQty ", Convert.ToString(current["FT" + "" + i + ""])); ;//鏃ヨ鍒掓暟閲�
jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
- //jsonFPOOrderEntry.Add("FSEQ", fseq); ;//搴忓彿
Entry.Add(jsonFPOOrderEntry);
- fseq++;
}
jsonModel.Add("FEntity", Entry);
jsonRoot.Add("Model", jsonModel);
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- //LogService.WriteAsync(jsonRoot);
if (saveIsSuc == "TRUE")
{
string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
@@ -488,6 +479,124 @@
}
return string.Empty;
}
- }
+ public void WriteImportLog()
+ {
+ try
+ {
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
+ string sql;
+ DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
+ //鑾峰彇鍗曟嵁浣撲俊鎭�
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ if (string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
+ continue;
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"
+/*dialect*/
+SELECT T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1
+ LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
+ join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
+ 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 = "";//鍗曚綅
+ 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();
+ }
+ 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("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("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("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 + ""])); ;//鏃ヨ鍒掓暟閲�
+ jsonFPOOrderEntry.Add("FColumn", "FT" + "" + i + ""); ;//瀵瑰簲鐨勫垪澶�
+ Entry.Add(jsonFPOOrderEntry);
+ }
+ jsonModel.Add("FEntity", Entry);
+ jsonRoot.Add("Model", jsonModel);
+ var result = cloudClient.Save("paez_Sc_WorkBillAutoSortBill_Log", jsonRoot.ToString());
+ JObject saveObj = JObject.Parse(result);
+ string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
+ if (saveIsSuc != "TRUE")
+ {
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏ヨ褰曟棩蹇楋紝鏂板寮傚父json锛�" + jsonRoot.ToString());
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏ヨ褰曟棩蹇楄烦鍑�:" + ex.Message.ToString());
+ }
+ }
+ }
}
--
Gitblit v1.9.1