From 25c5ea9d524cc7ba92b676bbd85a05889c335796 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 22 十二月 2020 17:42:43 +0800
Subject: [PATCH] 问题改进
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index fd6be72..2c1bd2c 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -27,11 +27,7 @@
[HotUpdate]
public class Pro_ScDayImport : AbstractDynamicFormPlugIn
{
-
-
-
private string fileFullPath = string.Empty;
-
//public override void BarItemClick(Kingdee.BOS.Core.DynamicForm.PlugIn.Args.BarItemClickEventArgs e)
//{
// base.BarItemClick(e);
@@ -53,8 +49,6 @@
// }
//}
-
-
public override void AfterBarItemClick(AfterBarItemClickEventArgs e)
{
base.AfterBarItemClick(e);
@@ -98,6 +92,10 @@
}
base.CustomEvents(e);
}
+ /// <summary>
+ /// 鏂囦欢涓婁紶鐣岄潰鏁版嵁鏄剧ず
+ /// </summary>
+ /// <param name="fileFullPath"></param>
private void ImportDataSC(string fileFullPath)
{
using (ExcelOperation helper = new ExcelOperation(this.View))
@@ -116,7 +114,6 @@
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 +121,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}' ", 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 = _dt.Rows[0]["FID"].ToString();
+ fDayPlanBillNo = _dt.Rows[0]["FBILLNO"].ToString();
+ }
//DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
@@ -147,27 +152,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 +180,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 +217,6 @@
DateTime targetDt = dtStart.Add(toNow);
return targetDt;
}
-
/// <summary>
/// 瀵煎叆鍔熻兘
/// </summary>
@@ -269,8 +292,6 @@
FQTY = dt.Rows[0]["FQTY"].ToString();
FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
}
-
-
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
jsonRoot.Add("NeedUpDateFields", new JArray());
@@ -346,7 +367,7 @@
{
jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//婧愬崟缂栧彿
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
+ 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();
@@ -355,29 +376,22 @@
{
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
{
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
+ 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();
@@ -418,9 +432,6 @@
}
}
-
-
-
/// <summary>
/// 鏁板瓧杞崲鏃堕棿鏍煎紡
/// </summary>
@@ -468,7 +479,6 @@
}
return string.Empty;
}
-
}
}
--
Gitblit v1.9.1