From 8524e9349787b08c974542cf21bcc133e03ee16d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 16 十二月 2020 15:17:28 +0800
Subject: [PATCH] 问题更改上传备份
---
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 13 ++-
src/BLL/Demo.BillView/Config/kdapi.config | 2
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 78 ++++++++++++++-----------
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 36 ++++++------
4 files changed, 71 insertions(+), 58 deletions(-)
diff --git a/src/BLL/Demo.BillView/Config/kdapi.config b/src/BLL/Demo.BillView/Config/kdapi.config
index 35fa91f..50a5a75 100644
--- a/src/BLL/Demo.BillView/Config/kdapi.config
+++ b/src/BLL/Demo.BillView/Config/kdapi.config
@@ -4,6 +4,6 @@
<add key="DbId" value="5f9258a311401c"></add>
<add key="UserName" value="Administrator"></add>
<add key="PassWord" value="888888"></add>
- <add key="KDApiUrl" value="http://erp-windows002/K3Cloud/"></add>
+ <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
</appSettings>
</configuration>
\ No newline at end of file
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index e29c91f..3c772f2 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -48,11 +48,14 @@
this.Model.SetValue("FCompleteCount", dt.Rows[i]["FCompleteCount"], i);//榻愬鏁伴噺
this.Model.SetValue("FLackCount", dt.Rows[i]["FLackCount"], i);//缂烘枡鏁伴噺
this.Model.SetValue("FPassableCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鍙敤鏁伴噺
- this.Model.SetValue("FMateralCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鐗╂枡鏁伴噺
+ this.Model.SetValue("FMateralCount", dt.Rows[i]["FHStockQty"].ToString(), i);//鐗╂枡鏁伴噺
this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
+ this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐
+ this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷
+ this.Model.SetValue("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富
}
}
did = true;
@@ -130,9 +133,6 @@
{
for (int i = 0; i < dt.Rows.Count; i++)
{
- decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
- decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
- decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
@@ -140,11 +140,14 @@
this.Model.SetValue("FCompleteCount", dt.Rows[i]["FCompleteCount"], i);//榻愬鏁伴噺
this.Model.SetValue("FLackCount", dt.Rows[i]["FLackCount"], i);//缂烘枡鏁伴噺
this.Model.SetValue("FPassableCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鍙敤鏁伴噺
- this.Model.SetValue("FMateralCount", dt.Rows[i]["FHLeftQty"].ToString(), i);//鐗╂枡鏁伴噺
+ this.Model.SetValue("FMateralCount", dt.Rows[i]["FHStockQty"].ToString(), i);//鐗╂枡鏁伴噺
this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
+ this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐
+ this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷
+ this.Model.SetValue("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富
}
}
this.View.UpdateView();
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;
}
-
}
}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 57d89b6..ec48004 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -639,7 +639,7 @@
_jsonRoot.Add("Model", _jsonModel);
- CloudClient _cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
+ CloudClient _cloudClient = new CloudClient("http://localhost/K3Cloud/");
var _result = _cloudClient.Save("paez_CompleteAnalysisTemp", _jsonRoot.ToString());
JObject _saveObj = JObject.Parse(_result);
string _saveIsSuc = _saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -712,7 +712,7 @@
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
var result = cloudClient.Save("paez_CompleteAnalysisTemp", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -770,8 +770,7 @@
LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId
LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID
---where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0 and T1.FMATERIALID in (105842,
---105843)
+where T1.FMATERIALID in (105773)
");
ListInventory = ds.ToModelList<PRD_Inventory>();
//鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
@@ -788,10 +787,8 @@
) T1
LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID
LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID
---where T1.FMATERIALID in (105842,
---105843)
+where T1.FMATERIALID in (105773)
group by T1.FStockOrgId,T1.FMATERIALID
-
");
ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
//闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
@@ -807,8 +804,8 @@
JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
--where FPRDMOMAINID = 100010
---where t4.FMATERIALID in (105842,
---105843)
+where t4.FMATERIALID in (105773
+)
ORDER BY b.FHMASTERDATE,a.FHOrderLev ";
ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
@@ -827,18 +824,18 @@
//瀹為檯鎬诲簱瀛�
decimal sjkc = 0;
var sjkcList = ListInventoryByStockOrgId.Where(x => x.FMATERIALID == _item.FMATERIALID2 && x.FStockOrgId == _item.FStockOrgId).FirstOrDefault();
- sjkc = sjkcList.FBASEQTY;
//鐪熸闇�瑕佸彇璁＄畻鐨勬暟閲忥紙鎷嗗垎璐т富锛�
//璐т富鍖归厤
List<PRD_Inventory> _ListInventory = ListInventory.Where(c => c.FMATERIALID == _item.FMATERIALID2 && c.FStockOrgId == _item.FStockOrgId && c.FBASEQTY > 0).ToList();
if (_ListInventory.Count > 0)
{
+ decimal _fLackCount = _item.PlanCount > sjkcList.FBASEQTY ? (_item.PlanCount - sjkcList.FBASEQTY) : 0;//缂烘枡鏁伴噺
foreach (var Inventory in _ListInventory)
{
if (need == 0)
break;
decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//榻愬鏁伴噺
- decimal _fLackCount = _item.PlanCount - fCompleteCount;//缂烘枡鏁伴噺
+ //鎬昏鍒掓暟閲� 鍜� 鎬诲簱瀛樻暟閲忔瘮瀵�
completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
{
FHMainICMOInterIDr = _item.FPRDMOMAINID,
@@ -856,16 +853,16 @@
FCompleteCount = fCompleteCount, //榻愬鏁伴噺
FLackCount = _fLackCount,//缂烘枡鏁伴噺
FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
- FHLeftQty = sjkcList.FBASEQTY,//鍙敤鏁伴噺
- FComPlete = _fLackCount > 0 ? "鏈綈濂�" : "榻愬",
+ FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
+ FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
});
//鎵ｅ噺鎬诲簱瀛樻暟閲�
- sjkcList.FBASEQTY = sjkc >= fCompleteCount ? sjkc - fCompleteCount : 0;
- //鎵ｅ噺娑堣�楀簱瀛�
- Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+ sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
//鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ //鎵ｅ噺娑堣�楀簱瀛�
+ Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
}
}
else
@@ -936,6 +933,9 @@
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '鏈綈濂�' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
+");
+ DBServiceHelper.Execute(Context, @"
+/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '榻愬' where FEntryID NOT IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
sw.Stop();//缁撴潫璁℃椂
LogHelper.Info("杩愯鎬绘椂闀匡細" + sw.Elapsed);
@@ -1070,7 +1070,7 @@
this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#FF0000", j);
}
- else
+ else if (dr["FCOMPLETE"].ToString() == "榻愬")
{
this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
grid.SetForecolor("FT" + "" + getDay.Days.ToString() + "", "#00FF00", j);
@@ -1684,7 +1684,7 @@
["Model"] = model
};
- CloudClient cloudClient = new CloudClient("http://erp-windows002/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
var result = cloudClient.Save("paez_PODemandPlan", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
--
Gitblit v1.9.1