From 2e5a31b54bc716a9dcaf28df6870b372f9af795c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 23 二月 2021 09:23:30 +0800
Subject: [PATCH] 问题更改上传
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 205 ++++++++++++++++++++++++++++----------------------
1 files changed, 114 insertions(+), 91 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 562a6ed..c41185e 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -27,11 +27,8 @@
[HotUpdate]
public class Pro_ScDayImport : AbstractDynamicFormPlugIn
{
-
-
-
+ CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
private string fileFullPath = string.Empty;
-
//public override void BarItemClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.BarItemClickEventArgs e)
//{
// base.BarItemClick(e);
@@ -53,13 +50,12 @@
// }
//}
-
-
public override void AfterBarItemClick(AfterBarItemClickEventArgs e)
{
base.AfterBarItemClick(e);
if (e.BarItemKey.ToUpper().Equals("TBIMPORT"))
{
+ LogService.WriteAsync("瀵煎叆鍔熻兘锛�");
ImportData();
}
@@ -72,7 +68,8 @@
//// 涓嬭浇鍦板潃
//string downloadUrl = "FileUpLoadServices/download.aspx";
//updateControl.SetCustomPropertyValue("ExDownLoadUrl", downloadUrl);
-
+ LogHelper.Info("222222");
+ LogService.WriteAsync("涓婁紶鍔熻兘锛�");
ImportDataSC(fileFullPath);
}
}
@@ -98,6 +95,10 @@
}
base.CustomEvents(e);
}
+ /// <summary>
+ /// 鏂囦欢涓婁紶鐣岄潰鏁版嵁鏄剧ず
+ /// </summary>
+ /// <param name="fileFullPath"></param>
private void ImportDataSC(string fileFullPath)
{
using (ExcelOperation helper = new ExcelOperation(this.View))
@@ -106,17 +107,40 @@
{
DataSet ds = helper.ReadFromFile(fileFullPath, 1);
DataTable dt = ds.Tables[0];
-
+ LogService.WriteAsync("瀵煎叆鍔熻兘锛歞t琛屾暟锛�" + dt.Rows.Count);
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
if (dt.Rows.Count > 0)
{
- //Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
- //DynamicObjectCollection rows = this.Model.GetEntityDataObject(entity);
- this.Model.DeleteEntryData("FEntity");
-
+ //楠岃瘉瀵煎叆妯℃澘
+ string ErrorResult = "";
+ string error = "";
for (int i = 0; i < dt.Rows.Count; i++)
{
+ error = "";
+ if (dt.Rows[i][1].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;";
+ if (dt.Rows[i][2].ToString() == "")
+ error += "鐢熶骇缁勭粐涓嶈兘涓虹┖;";
+ if (dt.Rows[i][3].ToString() == "")
+ error += "鐢熶骇杞﹂棿涓嶈兘涓虹┖;";
+ if (dt.Rows[i][5].ToString() == "")
+ error += "浜у搧浠ｇ爜涓嶈兘涓虹┖;";
+ if (dt.Rows[i][13].ToString() == "")
+ error += "浜よ揣鏃ユ湡涓嶈兘涓虹┖;";
+ if (dt.Rows[i][14].ToString() == "")
+ error += "璁㈠崟绛夌骇涓嶈兘涓虹┖;";
+ if (error.Length > 0)
+ ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n";
+ }
+ if (ErrorResult.Length > 0)
+ {
+ this.View.ShowErrMessage(ErrorResult);
+ return;
+ }
+ this.Model.DeleteEntryData("FEntity");
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
@@ -124,19 +148,27 @@
WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}'", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString());
DataTable _dt = new DataTable();
_dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
-
-
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
-
if (_dt.Rows.Count > 0)
{
FLOT = _dt.Rows[0]["FLOT"].ToString();
FQTY = _dt.Rows[0]["FQTY"].ToString();
FBILLNO = _dt.Rows[0]["FBILLNO"].ToString();
}
-
+ //鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙�
+ string fDayPlanID = "";
+ string fDayPlanBillNo = "";
+ sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
+left join T_ENG_WORKCENTER c on a.FHSourceID=c.fid
+ where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and (isnull(c.FNUMBER,'') ='{2}' or (select count(*) from T_ENG_WORKCENTER where isnull(c.FNUMBER,'') ='{2}')=0)", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString());
+ DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dayPlanDt.Rows.Count > 0)
+ {
+ fDayPlanID = dayPlanDt.Rows[0]["FID"].ToString();
+ fDayPlanBillNo = dayPlanDt.Rows[0]["FBILLNO"].ToString();
+ }
//DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
@@ -147,27 +179,23 @@
this.Model.SetItemValueByNumber("FResourcesId", dt.Rows[i][4].ToString(), i);
// this.Model.SetValue("FMatrailId", dt.Rows[i][5].ToString(), i);
this.Model.SetItemValueByNumber("FMatrailId", dt.Rows[i][5].ToString(), i);
- this.Model.SetValue("FMatrailName", dt.Rows[i][6].ToString(), i);
- this.Model.SetValue("FModel", dt.Rows[i][7].ToString(), i);
- this.Model.SetValue("FUnit", dt.Rows[i][8].ToString(), i);
this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);
this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);
this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].ToString()), i);
- this.Model.SetValue("FOrderLevel", dt.Rows[i][14].ToString(), i);
+ this.Model.SetValue("FOrderLevel", OrderType(dt.Rows[i][14].ToString()), i);
this.Model.SetValue("FOrderQuantity", FQTY, i);
+ this.Model.SetValue("FDayPlanID", fDayPlanID, i);//鏃ヨ鍒掑伐鍗旾D
+ this.Model.SetValue("FDayPlanBillNo", fDayPlanBillNo, i);//鏃ュ伐鍗曠紪鍙�
for (int j = 0; j <= 60; j++)
{
this.Model.SetValue("FT" + "" + j + "", dt.Rows[i][15 + j].ToString(), i);
}
-
//璋冪敤鏁伴噺鍊兼洿鏂�
this.View.InvokeFieldUpdateService("FT0", i);
}
}
-
this.View.UpdateView();
-
for (int j = 0; j <= 60; j++)
{
this.View.GetControl("FT" + "" + j + "").Text = date.AddDays(j).ToShortDateString();
@@ -179,7 +207,30 @@
}
+ /// <summary>
+ /// 璁㈠崟鐘舵�佺瓑绾�
+ /// </summary>
+ /// <param name="Type"></param>
+ /// <returns></returns>
+ public string OrderType(string Type)
+ {
+ switch (Type)
+ {
+ case "鐗规��":
+ return "1";
+ break;
+ case "绱ф��":
+ return "2";
+ break;
+ case "鏅��":
+ return "3";
+ break;
+ default:
+ return " ";
+ break;
+ }
+ }
/// <summary>
/// 鏃堕棿鎴砊imestamp杞崲鎴愭棩鏈�
/// </summary>
@@ -193,7 +244,6 @@
DateTime targetDt = dtStart.Add(toNow);
return targetDt;
}
-
/// <summary>
/// 瀵煎叆鍔熻兘
/// </summary>
@@ -202,14 +252,26 @@
try
{
LogService.WriteAsync("娴嬭瘯");
-
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);
-
+ List<string> sqlList = new List<string>();
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ if (Convert.ToString(current["FDayPlanID"]) == "0")
+ continue;
+ for (int i = 0; i <= 60; i++)
+ {
+ JObject jsonFPOOrderEntry = new JObject();
+ //閲嶅瀵煎叆鐨勬洿鏂版帀璁″垝鏁伴噺浠ュ強鏇存柊榻愬鐘舵�佷负绌�
+ sql = string.Format($"update SC_WORKBILLSORTBILLSub set FHQTY ='{Convert.ToString(current["FT" + "" + i + ""])}',FCOMPLETE='' where FID ={Convert.ToString(current["FDayPlanID"])} and FHMASTERDATE ={date.AddDays(i).ToShortDateString()} and FHLOCKEDSUB = 0");
+ sqlList.Add(sql);
+ }
+ }
+ int res = DBServiceHelper.ExecuteBatch(Context, sqlList);
string _result = "";
foreach (DynamicObject current in entityDataObjoct)
{
@@ -228,24 +290,20 @@
this.View.ShowErrMessage(_result);
return;
}
-
foreach (DynamicObject current in entityDataObjoct)
{
if (Convert.ToInt32(current["FNoScheduled"]) < 0)
_result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
-
}
if (_result != "")
{
this.View.ShowErrMessage(_result);
return;
}
-
foreach (DynamicObject current in entityDataObjoct)
{
- if (string.IsNullOrEmpty(Convert.ToString(current["FSalOrderNo"])) || string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
+ if (string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
continue;
-
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
@@ -254,13 +312,11 @@
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 鍘熷崟鍙�
-
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -269,22 +325,19 @@
FQTY = dt.Rows[0]["FQTY"].ToString();
FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
}
-
-
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
jsonRoot.Add("NeedUpDateFields", new JArray());
jsonRoot.Add("NeedReturnFields", new JArray());
- jsonRoot.Add("IsDeleteEntry", "true");
+ jsonRoot.Add("IsDeleteEntry", "false");
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
-
JObject jsonModel = new JObject();
jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
jsonModel.Add("FSCOrderNo", current["FSCOrderNo"].ToString()); //鐢熶骇璁㈠崟鍙稦SCOrderNo
- jsonModel.Add("FHSeOrderBillNo", current["FSalOrderNo"].ToString());//閿�鍞鍗曞彿
+ jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
jsonModel.Add("FHOrderLev", current["FOrderLevel"].ToString());//璁㈠崟绛夌骇
- jsonModel.Add("FSalOrderCount", current["FOrderLevel"].ToString());//閿�鍞鍗曟暟閲�
+ jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
jsonModel.Add("FHOrderCommitDate", current["FDeliveryDate"].ToString());//浜よ揣鏈烪OrderCommitDate
//jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
@@ -292,18 +345,12 @@
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
-
jsonModel.Add("FOrderQuantity", current["FOrderQuantity"].ToString()); ;//鐢熶骇璁㈠崟鏁伴噺
jsonModel.Add("FDayPlanQuantity", current["FDayPlanQuantity"].ToString()); ;//鏃ヨ鍒掓暟閲�
jsonModel.Add("FNoScheduled", current["FNoScheduled"].ToString()); ;//鏈帓鏁伴噺
-
-
-
-
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();
@@ -317,7 +364,6 @@
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();
@@ -325,28 +371,23 @@
jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID 鐢熶骇璧勬簮
}
JArray Entry = new JArray();
- for (int i = 0; i <= 60; i++)
- {
- 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("FHMainSourceBillType ", "鐢熶骇璁㈠崟"); ;//婧愬崟绫诲瀷
- //jsonFPOOrderEntry.Add("FHMainSourceBillNo", FBILLNO); ;//婧愬崟缂栧彿
- //jsonFPOOrderEntry.Add("FHMainSourceInterID", FID); ;//婧愬崟涓诲唴鐮�
- //jsonFPOOrderEntry.Add("FHMainSourceEntryID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
-
- Entry.Add(jsonFPOOrderEntry);
- }
-
- jsonModel.Add("FEntity", Entry);
- //鏃ヨ鍒掑伐鍗曚笉涓虹┖鏃秛pdate
if (Convert.ToString(current["FDayPlanID"]) != "0")
{
+ sql = $"select max(FHMASTERDATE)FHMASTERDATE from SC_WORKBILLSORTBILLSub where FID={Convert.ToString(current["FDayPlanID"])} ";
+ DateTime EndDate = DBServiceHelper.ExecuteScalar<DateTime>(Context, sql, DateTime.Now);
+ for (int i = 0; i <= 60; i++)
+ {
+ if (EndDate >= date.AddDays(i))
+ 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);
jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//婧愬崟缂栧彿
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -355,29 +396,27 @@
{
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("瀵煎叆鎴愬姛");
-
-
}
else
{
- //LogService.WriteAsync(saveIsSuc);
LogService.WriteAsync(jsonRoot);
LogHelper.Error(jsonRoot.ToString());
-
this.View.ShowErrMessage(jsonRoot.ToString());
-
-
}
}
else
{
+ for (int i = 0; i <= 60; i++)
+ {
+ 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);
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -386,41 +425,26 @@
{
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("瀵煎叆鎴愬姛");
-
}
else
{
- // LogService.WriteAsync(saveIsSuc);
LogService.WriteAsync(jsonRoot);
LogHelper.Error(jsonRoot.ToString());
-
this.View.ShowErrMessage(jsonRoot.ToString());
-
-
}
}
-
this.View.UpdateView();
-
-
}
}
catch (Exception ex)
{
-
this.View.ShowErrMessage(ex.ToString());
}
}
-
-
-
/// <summary>
/// 鏁板瓧杞崲鏃堕棿鏍煎紡
/// </summary>
@@ -468,7 +492,6 @@
}
return string.Empty;
}
-
}
}
--
Gitblit v1.9.1