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 | 190 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 151 insertions(+), 39 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 5347640..2c1bd2c 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -19,6 +19,7 @@
using Demo.TimedTaskPlugIn.PRD;
using ZD.Cloud.Logger;
+
namespace Demo.BillView.PRD
{
@@ -26,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);
@@ -52,8 +49,6 @@
// }
//}
-
-
public override void AfterBarItemClick(AfterBarItemClickEventArgs e)
{
base.AfterBarItemClick(e);
@@ -97,6 +92,10 @@
}
base.CustomEvents(e);
}
+ /// <summary>
+ /// 鏂囦欢涓婁紶鐣岄潰鏁版嵁鏄剧ず
+ /// </summary>
+ /// <param name="fileFullPath"></param>
private void ImportDataSC(string fileFullPath)
{
using (ExcelOperation helper = new ExcelOperation(this.View))
@@ -115,6 +114,34 @@
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
+JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID
+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);
@@ -125,24 +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("FProOrderCount", dt.Rows[i][11].ToString(), i);
this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
- this.Model.SetValue("FDeliveryDate", GetDateTime(Convert.ToInt32(dt.Rows[i][13].ToString())), i);
- this.Model.SetValue("FOrderLevel", dt.Rows[i][14].ToString(), i);
+ this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].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();
@@ -154,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>
@@ -168,7 +217,6 @@
DateTime targetDt = dtStart.Add(toNow);
return targetDt;
}
-
/// <summary>
/// 瀵煎叆鍔熻兘
/// </summary>
@@ -176,6 +224,8 @@
{
try
{
+ LogService.WriteAsync("娴嬭瘯");
+
string sql;
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
//鑾峰彇鍗曟嵁浣撲俊鎭�
@@ -202,6 +252,17 @@
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)
{
@@ -222,6 +283,7 @@
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -230,13 +292,11 @@
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", "false");
+ jsonRoot.Add("IsDeleteEntry", "true");
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
@@ -254,6 +314,12 @@
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());
@@ -266,17 +332,17 @@
jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 鐢熶骇缁勭粐
}
- if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
+ if (Convert.ToString(current["FResourcesId_Id"]) != "0")
{
JObject jsonFProductWorkShopId = new JObject();
- jsonFProductWorkShopId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
+ jsonFProductWorkShopId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHSourceID", jsonFProductWorkShopId);//FHSourceID 鐢熶骇杞﹂棿
}
- if (Convert.ToString(current["FResourcesId_Id"]) != "0")
+ if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
{
JObject jsonFResourcesId = new JObject();
- jsonFResourcesId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
+ jsonFResourcesId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID 鐢熶骇璧勬簮
}
JArray Entry = new JArray();
@@ -305,23 +371,21 @@
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"]["ResponseStatus"]["SuccessEntitys"]["Number"].ToString();
- string FDayPlanID = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"]["Id"].ToString();
-
- //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));//
- // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));//
-
-
+ 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
{
- this.View.ShowErrMessage("瀵煎叆澶辫触");
-
+ //LogService.WriteAsync(saveIsSuc);
+ LogService.WriteAsync(jsonRoot);
+ LogHelper.Error(jsonRoot.ToString());
+ this.View.ShowErrMessage(jsonRoot.ToString());
}
}
else
@@ -331,14 +395,14 @@
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();
string FDayPlanID = saveObj["Result"]["Id"].ToString();
- //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));//
- // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));//
+ this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"]) - 1);//
+ this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);//
this.View.ShowMessage("瀵煎叆鎴愬姛");
@@ -346,12 +410,17 @@
}
else
{
- this.View.ShowErrMessage("瀵煎叆澶辫触");
+ // LogService.WriteAsync(saveIsSuc);
+ LogService.WriteAsync(jsonRoot);
+ LogHelper.Error(jsonRoot.ToString());
+
+ this.View.ShowErrMessage(jsonRoot.ToString());
+
}
}
-
+ this.View.UpdateView();
}
@@ -363,10 +432,53 @@
}
}
+ /// <summary>
+ /// 鏁板瓧杞崲鏃堕棿鏍煎紡
+ /// </summary>
+ /// <param name="timeStr">鏁板瓧,濡�:42095.7069444444/0.650694444444444</param>
+ /// <returns>鏃ユ湡/鏃堕棿鏍煎紡</returns>
+ private string ToDateTimeValue(string strNumber)
+ {
+ if (!string.IsNullOrWhiteSpace(strNumber))
+ {
+ Decimal tempValue;
+ //鍏堟鏌� 鏄笉鏄暟瀛�;
+ if (Decimal.TryParse(strNumber, out tempValue))
+ {
+ //澶╂暟,鍙栨暣
+ int day = Convert.ToInt32(Math.Truncate(tempValue));
+ //杩欓噷涔熶笉鐭ラ亾涓轰粈涔�. 濡傛灉鏄皬浜�32,鍒欏噺1,鍚﹀垯鍑�2
+ //鏃ユ湡浠�1900-01-01寮�濮嬬疮鍔�
+ // day = day < 32 ? day - 1 : day - 2;
+ DateTime dt = new DateTime(1900, 1, 1).AddDays(day < 32 ? (day - 1) : (day - 2));
+ //灏忔椂:鍑忔帀澶╂暟,杩欎釜鏁板瓧杞崲灏忔椂:(* 24)
+ Decimal hourTemp = (tempValue - day) * 24;//鑾峰彇灏忔椂鏁�
+ //鍙栨暣.灏忔椂鏁�
+ int hour = Convert.ToInt32(Math.Truncate(hourTemp));
+ //鍒嗛挓:鍑忔帀灏忔椂,( * 60)
+ //杩欓噷鑸嶅叆,鍚﹀垯鍙栧�间細鏈�1鍒嗛挓璇樊.
+ Decimal minuteTemp = Math.Round((hourTemp - hour) * 60, 2);//鑾峰彇鍒嗛挓鏁�
+ int minute = Convert.ToInt32(Math.Truncate(minuteTemp));
+ //绉�:鍑忔帀鍒嗛挓,( * 60)
+ //杩欓噷鑸嶅叆,鍚﹀垯鍙栧�间細鏈�1绉掕宸�.
+ Decimal secondTemp = Math.Round((minuteTemp - minute) * 60, 2);//鑾峰彇绉掓暟
+ int second = Convert.ToInt32(Math.Truncate(secondTemp));
+ //鏃堕棿鏍煎紡:00:00:00
+ string resultTimes = string.Format("{0}:{1}:{2}",
+ (hour < 10 ? ("0" + hour) : hour.ToString()),
+ (minute < 10 ? ("0" + minute) : minute.ToString()),
+ (second < 10 ? ("0" + second) : second.ToString()));
-
+ if (day > 0)
+ return string.Format("{0} {1}", dt.ToString("yyyy-MM-dd"), resultTimes);
+ else
+ return resultTimes;
+ }
+ }
+ return string.Empty;
+ }
}
}
--
Gitblit v1.9.1