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/Pro_WorkBillPlatform.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
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