From 7f4fe08938f69b3c1f6e9253c300915ccef2588c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 15 十二月 2020 17:28:00 +0800
Subject: [PATCH] 测试上传
---
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 8 +++++++-
src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs | 29 ++++++++---------------------
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs | 2 ++
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 1 -
4 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index 298e3d0..e29c91f 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -112,7 +112,13 @@
//榻愬
string FCompleteStatus = Convert.ToString(this.Model.GetValue("FCompleteStatus"));
if (!string.IsNullOrEmpty(FCompleteStatus))
- sqlwhere += $" and CompleteStatus='{FCompleteStatus}'";
+ sqlwhere += $" and FComPlete='{FCompleteStatus}'";
+
+ //鏃ヨ鍒掓棩鏈�
+ string FPlanDate = Convert.ToString(this.Model.GetValue("FPlanDate2"));
+ if (!string.IsNullOrEmpty(FPlanDate))
+ sqlwhere += $" and FPlanDate='{FPlanDate}'";
+
//鐢熶骇璁㈠崟鍙�
string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
if (!string.IsNullOrEmpty(PRDBillNo))
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index 775fdd2..d0d6f74 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -32,6 +32,8 @@
}
else
{
+ DateTime begin_time = DateTime.Now.ToLocalTime()
+ var date =DateTime.Now.ToLocalTime();
if (did)
return;
string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index b82a5da..57d89b6 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1209,7 +1209,6 @@
}
}
-
/// <summary>
/// 鎻愭枡璁″垝
/// </summary>
diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs
index 4e3e74f..d61a125 100644
--- a/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs
+++ b/src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs
@@ -17,7 +17,6 @@
[HotUpdate]
public class DayPlanPPBomBillTimeTask : Kingdee.BOS.Contracts.IScheduleService
{
-
public void Run(Context ctx, Schedule schedule)
{
CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
@@ -25,7 +24,7 @@
{
string sql = string.Format(@"
/*dialect*/
-select t1.FID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER
+select t1.FID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY
FROM Sc_WorkBillSortBillSub t1
JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
@@ -54,18 +53,11 @@
//鍒犻櫎鍘熸湁鏃ヨ鍒掔敤鏂欐竻鍗�
JObject deletemodel = new JObject();
deletemodel.Add("Numbers", DataRow[0]["FBillNo"].ToString());
-
JObject _saveObj = JObject.Parse(cloudClient.Delete("Paez_Sc_DayPlanPPBomBill", deletemodel.ToString()));
string _saveIsSuc = _saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
-
- if (_saveIsSuc == "TRUE")
- {
-
- }
- else
- {
+ if (_saveIsSuc != "TRUE")
LogHelper.Error(_saveIsSuc);
- }
+
}
JObject model = new JObject();
model.Add("FHDate", DateTime.Now);
@@ -86,8 +78,10 @@
ModelEnty.Add("FHPPBomInterID", DataRow[i]["FPPBOM"].ToString());//鐢ㄦ枡娓呭崟涓诲唴鐮丗HPPBomInterID
ModelEnty.Add("FHPPBomEntryID", DataRow[i]["FENTRYID"].ToString());//鐢ㄦ枡娓呭崟瀛愬唴鐮丗HPPBomEntryID
ModelEnty.Add("FHSourceID", new JObject() { ["Fnumber"] = DataRow[i]["FHSOURCENUMBER"].ToString() });//鐢熶骇璧勬簮FHSourceID
-
- //model.Add("FHMaterSubID", DataRow[i]["FHQtyMust"].ToString());//鍒嗘瘝鍒嗗瓙
+ ModelEnty.Add("FNumerator", DataRow[i]["FNumerator"].ToString());//鍒嗘瘝
+ ModelEnty.Add("FDenominator", DataRow[i]["FDenominator"].ToString());//鍒嗗瓙
+ ModelEnty.Add("FFIXSCRAPQTY", DataRow[i]["FFIXSCRAPQTY"].ToString());//鍥哄畾鎹熻��
+ ModelEnty.Add("FHQtyScrap", DataRow[i]["FSCRAPRATE"].ToString());//鍙樺姩鎹熻�楃巼%
Entry.Add(ModelEnty);
}
model.Add("FEntity", Entry);
@@ -105,15 +99,8 @@
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- if (saveIsSuc == "TRUE")
- {
-
- }
- else
- {
+ if (saveIsSuc != "TRUE")
LogHelper.Error(saveIsSuc);
-
- }
}
}
}
--
Gitblit v1.9.1