From 82eb3f2600467ec9281b17d7ef97cf85f51e1e8e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 14 十二月 2020 16:22:01 +0800
Subject: [PATCH] 更改代码上传
---
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 3
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs | 4
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 407 ++++++++++++++++++++++++++++++++++++---------------------
3 files changed, 257 insertions(+), 157 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index 991f457..298e3d0 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -109,17 +109,14 @@
if (!string.IsNullOrEmpty(FMateralId))
sqlwhere += $" and FHMATERID='{FMateralId}'";
}
-
//榻愬
string FCompleteStatus = Convert.ToString(this.Model.GetValue("FCompleteStatus"));
if (!string.IsNullOrEmpty(FCompleteStatus))
sqlwhere += $" and CompleteStatus='{FCompleteStatus}'";
-
//鐢熶骇璁㈠崟鍙�
string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
if (!string.IsNullOrEmpty(PRDBillNo))
sqlwhere += $" and PRDBillNo='{PRDBillNo}'";
-
sql += sqlwhere;
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
this.Model.DeleteEntryData("FEntity");
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index dd6efae..775fdd2 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -42,7 +42,7 @@
where FHMainICMOInterIDr ='{0}' and FIDENTIFICAT=2 and FHMATERID ='{1}'", FHMainICMOInterIDr, FMatrailId);
sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a
left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
- where FHMATERID ='{0}'", FMatrailId);
+ where FCompleteCount>0 and FHMATERID ='{0}'", FMatrailId);
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
if (dt.Rows.Count > 0)
{
@@ -69,7 +69,7 @@
/// </summary>
public void SearchList()
{
- string sqlwhere = " where 1=1";
+ string sqlwhere = " where FCompleteCount>0 and 1=1";
string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a
left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
");
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 080462a..b82a5da 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -48,7 +48,6 @@
string PathName = "鏃ヨ鍒掑鍏ユā鏉�.xlsx";
List<PRD_Inventory> ListInventory;//搴撳瓨鏄庣粏
List<PRD_Inventory> ListInventoryByStockOrgId;//鐗╂枡鎬诲簱瀛�
-
public override void BarItemClick(BarItemClickEventArgs e)
{
base.BarItemClick(e);
@@ -118,7 +117,7 @@
if (e.BarItemKey.ToUpper() == "TBEDIT")
{
- SearchList222();
+ SearchListEdit();
}
}
/// <summary>
@@ -146,7 +145,6 @@
formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));
this.View.ShowForm(formPa);
}
-
/// <summary>
/// 瀵煎嚭鏁版嵁鍒癊xcel
/// </summary>
@@ -230,8 +228,6 @@
}
}
-
-
private string _fileId = string.Empty;
/// <summary>
/// 寮瑰嚭涓嬭浇鎻愮ず绐楋紝涓嬭浇鏂囦欢鑷冲鎴风鏈湴銆�
@@ -252,7 +248,6 @@
jObject.Put("urltitle", "杩欐槸鏂囦欢鍚�");
this.View.AddAction(JSAction.openUrlWindow, new JSONArray { jObject });
}
-
/// <summary>
/// 閿佸畾
/// </summary>
@@ -293,7 +288,6 @@
else
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
-
/// <summary>
/// 瑙ｉ攣
/// </summary>
@@ -334,7 +328,6 @@
else
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
-
/// <summary>
/// 淇濆瓨鍔熻兘
/// </summary>
@@ -393,7 +386,6 @@
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
-
/// <summary>
/// 榻愬鍒嗘瀽
/// </summary>
@@ -537,7 +529,6 @@
}
}
-
/// <summary>
/// 璁＄畻鏈�澶ч綈濂楁暟閲�
/// </summary>
@@ -753,17 +744,19 @@
}
return SumGetComplete.ToString();
}
-
-
-
- ///榻愬鍒嗘瀽
-
+ /// <summary>
+ /// 榻愬鍒嗘瀽
+ /// </summary>
public void CompleteSetAnalysis()
{
- Stopwatch sw = new Stopwatch();
- sw.Start();//寮�濮嬭鏃�
- //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺
- DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @"
+ try
+ {
+ Stopwatch sw = new Stopwatch();
+ sw.Start();//寮�濮嬭鏃�
+ //娓呯┖榻愬涓存椂琛�
+ DBServiceHelper.Execute(Context, "/*dialect*/ delete JIT_MOMaterReadysBill ");
+ //鑾峰彇褰撳墠鍗虫椂搴撳瓨 鎸夌収鐗╂枡+搴撳瓨缁勭粐+璐т富+搴撳瓨鏁伴噺
+ DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @"
/*dialect*/
select isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0) FBASEQTY,T1.FStockOrgId,T1.FMATERIALID,a.FOWNERID,c.FNUMBER from
(
@@ -777,12 +770,12 @@
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
+--where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0 and T1.FMATERIALID in (105842,
+--105843)
");
- ListInventory = ds.ToModelList<PRD_Inventory>();
-
- //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
- ds = DBServiceHelper.ExecuteDataSet(Context, @"
+ ListInventory = ds.ToModelList<PRD_Inventory>();
+ //鎬诲簱瀛� 鐗╂枡+搴撳瓨缁勭粐+搴撳瓨鏁伴噺
+ ds = DBServiceHelper.ExecuteDataSet(Context, @"
/*dialect*/
select sum(isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0))FBASEQTY,T1.FStockOrgId,T1.FMATERIALID from
(
@@ -794,15 +787,15 @@
group by a.FHPRDORGID,T2.FMATERIALID
) 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
+LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID
+--where T1.FMATERIALID in (105842,
+--105843)
group by T1.FStockOrgId,T1.FMATERIALID
");
- ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
-
-
- //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
- string sql = @"
+ ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
+ //闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
+ string sql = @"
/*dialect*/
select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,FHQTY*(FNeedQty/FQty) PlanCount from SC_WORKBILLSORTBILLMAIN a
@@ -814,38 +807,69 @@
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)
ORDER BY b.FHMASTERDATE,a.FHOrderLev ";
- ds = DBServiceHelper.ExecuteDataSet(Context, sql);
- List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
-
- //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
- var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
-
- //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
- List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
- foreach (var item in DatePlanList)
- {
- //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
- var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
- foreach (var _item in _BomList)
+ ds = DBServiceHelper.ExecuteDataSet(Context, sql);
+ List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
+ //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
+ var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
+ //CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
+ List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
+ foreach (var item in DatePlanList)
{
- //璇ユ棩璁″垝鐗╂枡闇�瑕佹暟
- decimal need = _item.PlanCount;
- //瀹為檯鎬诲簱瀛�
- 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)
+ //绛涢�夊嚭褰撴棩璁″垝鏁版嵁
+ var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
+ foreach (var _item in _BomList)
{
- foreach (var Inventory in _ListInventory)
+ //璇ユ棩璁″垝鐗╂枡闇�瑕佹暟
+ decimal need = _item.PlanCount;
+ //瀹為檯鎬诲簱瀛�
+ 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)
{
- if (need == 0)
- break;
- decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//榻愬鏁伴噺
- decimal fLackCount = _item.PlanCount - fCompleteCount;//缂烘枡鏁伴噺
+ 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,
+ FHMainICMOEntryID = _item.FPRDMOENTYID,
+ FHICMOInterID = _item.FID.ToString(),
+ FHICMOEntryID = _item.FEntryID.ToString(),
+ FHMaterID = _item.FNumber,
+ FHStockOrgID = _item.OrgFnumber,
+ FHPRDORGID = _item.OrgFnumber,
+ FPRDBillNo = _item.FMOBillNO,
+ FOwnerTypeId = "BD_OwnerOrg",
+ FOwnerId = Inventory.Fnumber,
+ FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
+ FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FCompleteCount = fCompleteCount, //榻愬鏁伴噺
+ FLackCount = _fLackCount,//缂烘枡鏁伴噺
+ FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
+ FHLeftQty = sjkcList.FBASEQTY,//鍙敤鏁伴噺
+ FComPlete = _fLackCount > 0 ? "鏈綈濂�" : "榻愬",
+ FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ });
+ //鎵ｅ噺鎬诲簱瀛樻暟閲�
+ sjkcList.FBASEQTY = sjkc >= fCompleteCount ? sjkc - fCompleteCount : 0;
+ //鎵ｅ噺娑堣�楀簱瀛�
+ Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
+ //鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
+ need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
+ }
+ }
+ else
+ {
completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
{
FHMainICMOInterIDr = _item.FPRDMOMAINID,
@@ -857,103 +881,70 @@
FHPRDORGID = _item.OrgFnumber,
FPRDBillNo = _item.FMOBillNO,
FOwnerTypeId = "BD_OwnerOrg",
- FOwnerId = Inventory.Fnumber,
FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
- FCompleteCount = fCompleteCount, //榻愬鏁伴噺
- FLackCount = fLackCount,//缂烘枡鏁伴噺
- FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
- FHLeftQty = sjkcList.FBASEQTY,//鍙敤鏁伴噺
- FComPlete = fLackCount > 0 ? "鏈綈濂�" : "榻愬",
+ FCompleteCount = 0, //榻愬鏁伴噺
+ FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
+ FHStockQty = 0,//鍗虫椂搴撳瓨
+ FHLeftQty = 0,//鍙敤鏁伴噺
+ FComPlete = "鏈綈濂�",
FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
});
-
- //鎵ｅ噺鎬诲簱瀛樻暟閲�
- sjkcList.FBASEQTY = sjkc - fCompleteCount > 0 ? sjkc - fCompleteCount : 0;
- need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
}
}
- else
+ }
+ foreach (var item in completeAnalysisTempModel)
+ {
+ JObject jsonRoot = new JObject();
+ jsonRoot.Add("Creator", "");
+ jsonRoot.Add("NeedUpDateFields", new JArray());
+ jsonRoot.Add("NeedReturnFields", new JArray());
+ jsonRoot.Add("IsDeleteEntry", "true");
+ jsonRoot.Add("SubSystemId", "");
+ jsonRoot.Add("IsVerifyBaseDataField", "");
+ JObject jsonModel = new JObject();
+ jsonModel.Add("FHMainICMOInterIDr", item.FHMainICMOInterIDr);
+ jsonModel.Add("FHMainICMOEntryID", item.FHMainICMOEntryID);
+ jsonModel.Add("FHICMOInterID", item.FHICMOInterID);
+ jsonModel.Add("FHICMOEntryID", item.FHICMOEntryID);
+ jsonModel.Add("FHMaterID", new JObject() { ["FNUMBER"] = item.FHMaterID });
+ jsonModel.Add("FHUseQty", item.FHUseQty);
+ jsonModel.Add("FHStockOrgID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+ jsonModel.Add("FHStockQty", item.FHStockQty);
+ jsonModel.Add("FHLeftQty", item.FHLeftQty);
+ jsonModel.Add("FHPRDORGID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
+ jsonModel.Add("FUnitDosage", item.FUnitDosage);
+ jsonModel.Add("FSumPlanCount", item.FSumPlanCount);
+ jsonModel.Add("FCompleteCount", item.FCompleteCount);
+ jsonModel.Add("FPRDBillNo", item.FPRDBillNo);
+ jsonModel.Add("FOwnerTypeId", item.FOwnerTypeId);
+ jsonModel.Add("FComPlete", item.FComPlete);
+ jsonModel.Add("FLackCount", item.FLackCount);
+ jsonModel.Add("FPlanDate", item.FPlanDate);
+ if (item.FOwnerId != null)
+ jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
+ jsonRoot.Add("Model", jsonModel);
+ 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();
+ if (saveIsSuc != "TRUE")
{
- completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
- {
- FHMainICMOInterIDr = _item.FPRDMOMAINID,
- FHMainICMOEntryID = _item.FPRDMOENTYID,
- FHICMOInterID = _item.FID.ToString(),
- FHICMOEntryID = _item.FEntryID.ToString(),
- FHMaterID = _item.FNumber,
- FHStockOrgID = _item.OrgFnumber,
- FHPRDORGID = _item.OrgFnumber,
- FPRDBillNo = _item.FMOBillNO,
- FOwnerTypeId = "BD_OwnerOrg",
- FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
- FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
- FCompleteCount = 0, //榻愬鏁伴噺
- FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
- FHStockQty = 0,//鍗虫椂搴撳瓨
- FHLeftQty = 0,//鍙敤鏁伴噺
- FComPlete = "鏈綈濂�",
- FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
- });
+ LogHelper.Error(jsonRoot.ToString());
}
}
- }
- foreach (var item in completeAnalysisTempModel)
- {
-
- JObject jsonRoot = new JObject();
- jsonRoot.Add("Creator", "");
- jsonRoot.Add("NeedUpDateFields", new JArray());
- jsonRoot.Add("NeedReturnFields", new JArray());
- jsonRoot.Add("IsDeleteEntry", "true");
- jsonRoot.Add("SubSystemId", "");
- jsonRoot.Add("IsVerifyBaseDataField", "");
-
- JObject jsonModel = new JObject();
- jsonModel.Add("FHMainICMOInterIDr", item.FHMainICMOInterIDr);
- jsonModel.Add("FHMainICMOEntryID", item.FHMainICMOEntryID);
- jsonModel.Add("FHICMOInterID", item.FHICMOInterID);
- jsonModel.Add("FHICMOEntryID", item.FHICMOEntryID);
- jsonModel.Add("FHMaterID", new JObject() { ["FNUMBER"] = item.FHMaterID });
- jsonModel.Add("FHUseQty", item.FHUseQty);
- jsonModel.Add("FHStockOrgID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
- jsonModel.Add("FHStockQty", item.FHStockQty);
- jsonModel.Add("FHLeftQty", item.FHLeftQty);
- jsonModel.Add("FHPRDORGID", new JObject() { ["FNUMBER"] = item.FHStockOrgID });
- jsonModel.Add("FUnitDosage", item.FUnitDosage);
- jsonModel.Add("FSumPlanCount", item.FSumPlanCount);
- jsonModel.Add("FCompleteCount", item.FCompleteCount);
- jsonModel.Add("FPRDBillNo", item.FPRDBillNo);
- jsonModel.Add("FOwnerTypeId", item.FOwnerTypeId);
- jsonModel.Add("FComPlete", item.FComPlete);
- jsonModel.Add("FPlanDate", item.FPlanDate);
- if (item.FOwnerId != null)
- jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
-
-
- jsonRoot.Add("Model", jsonModel);
-
- 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();
-
- if (saveIsSuc != "TRUE")
- {
- LogHelper.Error(jsonRoot.ToString());
- }
- }
- //鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
- 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 IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'鏈綈濂�') ='鏈綈濂�')
");
- sw.Stop();//缁撴潫璁℃椂
- LogHelper.Info("杩愯鎬绘椂闀匡細" + sw.Elapsed);
-
+ sw.Stop();//缁撴潫璁℃椂
+ LogHelper.Info("杩愯鎬绘椂闀匡細" + sw.Elapsed);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message.ToString());
+ }
}
-
-
-
/// <summary>
/// 鏌ヨ
/// </summary>
@@ -1040,7 +1031,7 @@
sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
-
+
foreach (DataRow dr in _dt.Rows)
{
/*
@@ -1056,13 +1047,8 @@
this.Model.SetValue("FT" + getDay.Days.ToString(), dr["FHQTY"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
if (dr["FHLockedSub"].ToString() == "1")
this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
-
-
-
}
-
this.View.InvokeFieldUpdateService("FMatrailId", i);//璋冪敤鏁伴噺鍊兼洿鏂�
-
}
this.View.UpdateView();
for (int j = 0; j < dt.Rows.Count; j++)
@@ -1103,13 +1089,130 @@
}
+
+ }
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ public void SearchListEdit()
+ {
+ string sqlwhere = " where 1=1";
+
+ if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
+ {
+ string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
+ if (!string.IsNullOrEmpty(FProWorkShopId))
+ sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'";
+ }
+ //閿�鍞鍗曞彿
+ string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
+ if (string.IsNullOrEmpty(FSalOrder))
+ {
+
+ }
+ else
+ sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+ //鐢熶骇璁㈠崟鍙�
+ string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
+ if (string.IsNullOrEmpty(FScOrderMainNo))
+ {
+
+ }
+ else
+ sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
+
+ //鐗╂枡
+ if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
+ {
+ string FMatralId = (this.Model.GetValue("FMatralId") as DynamicObject)["Number"].ToString();
+ if (!string.IsNullOrEmpty(FMatralId))
+ sqlwhere += $" and t3.FNumber='{FMatralId}'";
+ }
+ //缂栧埗鏃ユ湡
+ string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
+ if (!string.IsNullOrEmpty(FPreparatDate))
+ sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
+ try
+ {
+ string sql = @"/*dialect*/select t1.* from Sc_WorkBillSortBillMain t1
+ left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
+" + sqlwhere;
+ DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ DateTime DateNow = DateTime.Now;//鑾峰彇褰撳墠鏃ユ湡
+ this.Model.DeleteEntryData("FEntity");
+ EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ this.Model.CreateNewEntryRow("FEntity");
+ this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
+ this.Model.SetValue("FCompleteSetCount", "", i);//鎬婚綈濂楁暟閲�
+ this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//閿�鍞鍗曟暟閲�
+ this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//鎵规鍙�
+ this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//璁￠噺鍗曚綅
+ this.Model.SetValue("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//鐢熶骇缁勭粐
+ this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//浜у搧浠ｇ爜
+ this.Model.SetValue("FDeliverydate", dt.Rows[i]["FHOrderCommitDate"].ToString(), i);//浜よ揣鏃ユ湡
+ this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//璁㈠崟绛夌骇
+ this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//鐢熶骇璁㈠崟鍙�
+ this.Model.SetValue("FSalOrderNo", dt.Rows[i]["FHSEORDERBILLNO"].ToString(), i);//閿�鍞鍗曞彿
+ this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//缂栧埗鏃ユ湡
+ this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID
+ this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID
+ this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
+ this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇璧勬簮
+ this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇杞﹂棿
+ this.Model.SetValue("FCompleteSetCount", dt.Rows[i]["FCompleteCount"].ToString(), i);//榻愬鏁伴噺
+ this.Model.SetValue("FOrderQuantity", dt.Rows[i]["FOrderQuantity"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
+ this.Model.SetValue("FDayPlanQuantity", dt.Rows[i]["FDayPlanQuantity"].ToString(), i);//鏃ヨ鍒掓暟閲�
+ this.Model.SetValue("FNoScheduled", dt.Rows[i]["FNoScheduled"].ToString(), i);//鏈帓鏁伴噺
+ sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
+ DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ foreach (DataRow dr in _dt.Rows)
+ {
+ DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
+ DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
+ TimeSpan getDay = end.Subtract(start);
+ if (getDay.Days > 60)
+ continue;
+ this.Model.SetValue("FT" + getDay.Days.ToString(), dr["FHQTY"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
+ if (dr["FHLockedSub"].ToString() == "1")
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ }
+ this.View.InvokeFieldUpdateService("FMatrailId", i);//璋冪敤鏁伴噺鍊兼洿鏂�
+ }
+ this.View.UpdateView();
+ for (int j = 0; j < dt.Rows.Count; j++)
+ {
+ sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[j]["FID"].ToString();
+ DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ foreach (DataRow dr in _dt.Rows)
+ {
+ DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
+ DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
+ TimeSpan getDay = end.Subtract(start);
+ if (getDay.Days > 60)
+ continue;
+ if (dr["FHLockedSub"].ToString() == "1")
+ this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //鍗曟嵁浣撹閿佸畾瀛楁
+ }
+ }
+ for (int m = 0; m <= 60; m++)
+ {
+ this.View.GetControl("FT" + "" + m + "").Text = DateNow.AddDays(m).ToShortDateString();
+ }
+ }
+ catch (Exception ex)
+ {
+ this.View.ShowErrMessage(ex.Message.ToString());
+ }
+
}
/// <summary>
/// 鎻愭枡璁″垝
/// </summary>
-
-
public void Extraction3()
{
--
Gitblit v1.9.1