From 2a2e3fbbef29bbc568b10f2bd45bd6e658443d6e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 19 三月 2021 14:42:43 +0800
Subject: [PATCH] 问题处理
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 4e38a3d..b54443b 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1,7 +1,7 @@
锘縰sing Demo.Model.Model;
using Demo.Model.Model.PODemandPlan;
+using Demo.Utility;
using K3Cloud.Extend.Utils;
-using Kingdee.BOS.App.Data;
using Kingdee.BOS.Core;
using Kingdee.BOS.Core.Bill.PlugIn;
using Kingdee.BOS.Core.Const;
@@ -39,7 +39,6 @@
using System.Web;
using System.Windows.Documents;
using ZD.Cloud.Logger;
-using ZD.Cloud.WebApi;
using ZD.Share.Common;
namespace Demo.DynamicForm.PRD
@@ -268,7 +267,7 @@
jObject.Put("desc", "璇风偣鍑绘墦寮�闄勪欢锛�");
jObject.Put("urltitle", "杩欐槸鏂囦欢鍚�");
this.View.AddAction(JSAction.openUrlWindow, new JSONArray { jObject });
- }
+ }
/// <summary>
/// 閿佸畾
/// </summary>
@@ -279,16 +278,16 @@
string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate())";
sqlList.Add(sql);
int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
- if (result > 0)
- {
- //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
- DayPlanPPBomBillBatch();
- Extraction();
- SearchList();
- this.View.ShowMessage("鎿嶄綔鎴愬姛");
- }
- else
- this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
+ //if (result > 0)
+ //{
+ //閿佸畾鍚庣敓鎴愭棩璁″垝鐢ㄦ枡娓呭崟 鍙� 鎻愭枡璁″垝
+ DayPlanPPBomBillBatch();
+ Extraction();
+ SearchList();
+ this.View.ShowMessage("鎿嶄綔鎴愬姛");
+ //}
+ //else
+ // this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
}
/// <summary>
/// 瑙ｉ攣
@@ -646,7 +645,7 @@
if (item.FOwnerId != null)
jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
jsonRoot.Add("Model", jsonModel);
- CloudClient cloudClient = new CloudClient("http://localhost/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();
@@ -897,7 +896,7 @@
["IsVerifyBaseDataField"] = "false",
["Model"] = Fentity
};
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
var result = cloudClient.BatchSave("paez_CompleteAnalysisTemp", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -1190,6 +1189,7 @@
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("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].ToString(), i);//
this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHOrderQty"].ToString(), i);//閿�鍞鍗曟暟閲�
this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//鎵规鍙�
this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//璁￠噺鍗曚綅
@@ -1319,6 +1319,7 @@
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("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].ToString(), i);//
this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHOrderQty"].ToString(), i);//閿�鍞鍗曟暟閲�
this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//鎵规鍙�
this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//璁￠噺鍗曚綅
@@ -1488,7 +1489,7 @@
["Model"] = model
};
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
var result = cloudClient.Save("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
@@ -1518,7 +1519,7 @@
string sql = string.Format(@"
/*dialect*/
select t1.FID,t1.FEntryID,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 FPPBOMENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID,t2.FSCORDERNO,
-t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType
+t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType,FMaterialType
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
@@ -1573,7 +1574,8 @@
FOwnerID = dr["FORGNUMBER"].ToString(),
FEntrustPickOrgId = dr["FORGNUMBER"].ToString(),
FMOID = dr["FMOID"].ToString(),
- FIssueType = dr["FIssueType"].ToString()
+ FIssueType = dr["FIssueType"].ToString(),
+ FMaterialType = dr["FMaterialType"].ToString()
});
}
LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
@@ -1595,6 +1597,7 @@
model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID
model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮�
JArray Entry = new JArray();
+ int FSEQ = 1;
foreach (var _item in _DayPlanMaterial)
{
JObject ModelEnty = new JObject();
@@ -1619,8 +1622,11 @@
ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });//
ModelEnty.Add("FMOID", _item.FMOID);//
ModelEnty.Add("FISSUETYPE", _item.FIssueType);//
-
+ ModelEnty.Add("FMaterialType", _item.FMaterialType);//
+ // ModelEnty.Add("FSEQ", FSEQ);//
Entry.Add(ModelEnty);
+ FSEQ++;
+
}
model.Add("FEntity", Entry);
@@ -1633,18 +1639,18 @@
["Creator"] = "",
["NeedUpDateFields"] = new JArray(),
["NeedReturnFields"] = new JArray(),
- ["IsDeleteEntry"] = "false",
+ ["IsDeleteEntry"] = "true",
["SubSystemId"] = "",
["IsVerifyBaseDataField"] = "false",
["Model"] = Fentity
};
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
var result = cloudClient.BatchSave("Paez_Sc_DayPlanPPBomBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
if (saveIsSuc != "TRUE")
{
- LogHelper.Error(jsonRoot.ToString());
+ LogHelper.Error(saveObj.ToString());
}
Fentity = new JArray();
}
@@ -1688,13 +1694,14 @@
//閲囪喘璁㈠崟鏁版嵁
sql = @"
/*dialect*/
-select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
+ select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
join t_PUR_POOrderEntry t2 on t1.FID = t2.FID
join t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
join T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
join T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
where t2.FQTY-t2.FPODemandPlanCount>0
and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
+ and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
";
List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
@@ -1737,7 +1744,7 @@
List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
//鐗╂枡+搴撳瓨缁勭粐鍒嗙被
var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FStockOrgId = x.Key.FStockOrgId }).ToList();
- var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "162305").ToList();
+ var _MaterialIDList = MaterialIDList.Where(p => p.FMATERIALID == "163165").ToList();
LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎬荤墿鏂欒鏁�" + MaterialIDList.Count);
//鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
@@ -1747,14 +1754,14 @@
foreach (var item in MaterialIDList)
{
//褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
- List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+ List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
if (_PurchaseInventory.Count == 0)
{
LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
continue;
}
//LogHelper.Info(item.FMATERIALID.ToString());
- //褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
+ //褰撳墠鐗╂枡鍜屽簱瀛樼粍缁囧搴旂殑闇�杩涜鎻愭枡璁″垝鐨勬暟鎹�
List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//鏈�灏忚捣璁㈤噺
double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//鎻愬墠鏈�
@@ -1769,7 +1776,7 @@
foreach (var _item in _DayPlanPpbom)
{
i++;
- _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).ToList();
+ _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
if (_PurchaseInventory.Count == 0)
{
LogHelper.Info("[鎻愭枡璁″垝寮�濮媇褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + " 搴撳瓨缁勭粐锛�" + item.FStockOrgId);
@@ -1781,9 +1788,9 @@
FEntryIdList.Add(_item.FENTRYID);
NeedQty += _item.NeedQty;
- LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
- LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
- LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
+ //LogHelper.Info("璁板綍鏄庣粏id锛�" + _item.FENTRYID + "");
+ //LogHelper.Info("鎬婚渶姹傞噺锛�" + NeedQty + "");
+ //LogHelper.Info("鏈�灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
if (NeedQty <= FMINPOQTY)
{
LogHelper.Info("[鎻愭枡璁″垝]褰撳墠鐗╂枡鏄庣粏鏃犻噰璐俊鎭細" + item.FMATERIALID + ",鏁伴噺锛�" + NeedQty + "锛屾渶灏忚捣璁㈤噺锛�" + FMINPOQTY + "");
@@ -1796,7 +1803,8 @@
//{
foreach (var Purchase in _PurchaseInventory)
{
- LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
+ LogHelper.Info("閲囪喘璁㈠崟鍙锋祴璇曪細" + Purchase.FBillNo);
+ //LogHelper.Info("鐗╂枡锛�" + Purchase.FMATERIALID + ",閲囪喘璁㈠崟鏁伴噺锛�" + Purchase.FQTY);
if (Purchase.FQTY >= NeedQty)
{
foreach (int id in FEntryIdList)
@@ -1846,13 +1854,13 @@
{
var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
decimal Qty = DayPlanPpbomls.NeedQty;//璁㈠崟鏁伴噺
- if (Qty == 0)
- LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+ //if (Qty == 0)
+ // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
if (Qty > _NeedQty)
Qty = _NeedQty; //璁㈠崟鏁伴噺>閲囪喘璁㈠崟鏁伴噺 鍙栭噰璐鍗�
- if (_NeedQty == 0)
- LogHelper.Info("璁㈠崟鏁伴噺涓�0");
+ //if (_NeedQty == 0)
+ // LogHelper.Info("璁㈠崟鏁伴噺涓�0");
_NeedQty = _NeedQty - Qty;
PODemandPlanTemp.Add(new Demo.Model.Model.PODemandPlan.PODemandPlanTemp
@@ -2020,10 +2028,12 @@
string PurchseFNUMBER = item.PurchseFNUMBER;
JObject model = new JObject();
model.Add("FHDate", date);
- model.Add("FHRemark", "鐢熶骇璁㈠崟鍙凤細" + "娴嬭瘯鍛㈠憿");
+ model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });
+
JArray Fentity = new JArray();
List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
+ int FSEQ = 1;
foreach (var _item in _PODemandPlanList)
{
JObject FentityModel = new JObject();
@@ -2042,7 +2052,11 @@
FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //閲囪喘璁㈠崟瀛愬唴鐮侊細FHPOOrderEntryID
FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
+ //FentityModel.Add("FSEQ", FSEQ); //鍙戞枡鏂瑰紡
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
+
Fentity.Add(FentityModel);
+ FSEQ++;
}
model.Add("FEntity", Fentity);
FinalyResult.Add(model);
@@ -2059,7 +2073,7 @@
["IsVerifyBaseDataField"] = "false",
["Model"] = FinalyResult
};
- CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
+ CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
var result = cloudClient.BatchSave("paez_PODemandPlan", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
--
Gitblit v1.9.1