From c9c8ac9b6dd18ec40a52173924b2649b287b7aa6 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 05 三月 2021 15:39:31 +0800
Subject: [PATCH] 3.5 15.30修改代码上传
---
src/Model/Demo.Model/Model/DayPlanMaterial.cs | 6 ++++++
src/BLL/Demo.BillView/PRD/Pro_TlPush.cs | 8 ++++++--
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 19 +++++++++++--------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
index 3b729e8..142f471 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
@@ -202,15 +202,19 @@
dynamicFormShowParameter.FormId = "SCP_PushParamFrom";
dynamicFormShowParameter.ParentPageId = formView.PageId;
dynamicFormShowParameter.OpenStyle.ShowType = ShowType.Modal;
- dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "paez_PODemandPlan");
+ //dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "paez_PODemandPlan");
+ //dynamicFormShowParameter.CustomComplexParams.Add("TargetFormId", "SCP_ReceiveBill");
+ dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "PUR_PurchaseOrder");
dynamicFormShowParameter.CustomComplexParams.Add("TargetFormId", "PUR_ReceiveBill");
+
formView.ShowForm(dynamicFormShowParameter, delegate (FormResult results)
{
if (results != null && results.ReturnData != null)
{
DynamicObject dynamicObject = results.ReturnData as DynamicObject;
string CbConvertRule = Convert.ToString(dynamicObject["CbConvertRule"]);
- List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "paez_PODemandPlan", "PUR_ReceiveBill");
+ List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "PUR_PurchaseOrder", "PUR_ReceiveBill");
+ //List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "paez_PODemandPlan", "SCP_ReceiveBill");
ConvertRuleElement rule = convertRules.FirstOrDefault((ConvertRuleElement t) => t.Id == CbConvertRule);
PushPurOrderToRec(formView, selEntryIds, rule);
}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index bfdc780..00ed3f7 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1520,7 +1520,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
@@ -1575,7 +1575,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);
@@ -1622,7 +1623,8 @@
ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });//
ModelEnty.Add("FMOID", _item.FMOID);//
ModelEnty.Add("FISSUETYPE", _item.FIssueType);//
- // ModelEnty.Add("FSEQ", FSEQ);//
+ ModelEnty.Add("FMaterialType", _item.FMaterialType);//
+ // ModelEnty.Add("FSEQ", FSEQ);//
Entry.Add(ModelEnty);
FSEQ++;
@@ -1638,7 +1640,7 @@
["Creator"] = "",
["NeedUpDateFields"] = new JArray(),
["NeedReturnFields"] = new JArray(),
- ["IsDeleteEntry"] = "false",
+ ["IsDeleteEntry"] = "true",
["SubSystemId"] = "",
["IsVerifyBaseDataField"] = "false",
["Model"] = Fentity
@@ -1679,7 +1681,7 @@
DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FDayPlanWorkID = "";
foreach (DataRow dr in fidDt.Rows)
- {
+ {
FDayPlanWorkID += Convert.ToString(dr["FID"]) + ",";
}
FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1);
@@ -1693,13 +1695,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);
@@ -1752,7 +1755,7 @@
foreach (var item in MaterialIDList)
{
//褰撳墠鐗╂枡娌℃湁閲囪喘璁㈠崟鏃� 鐩存帴璺冲嚭
- List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x=>x.FENTRYID).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);
@@ -1831,7 +1834,7 @@
FORGNumber = Purchase.FORGNumber
});
//鎵ｉ櫎鏃ヨ鍒掓槑缁嗗凡琚垎閰嶇殑鏁伴噺
- DayPlanPpbomls.NeedQty = 0;
+ DayPlanPpbomls.NeedQty = 0;
}
FEntryIdList.Clear();
//鏇存柊閲囪喘璁㈠崟
diff --git a/src/Model/Demo.Model/Model/DayPlanMaterial.cs b/src/Model/Demo.Model/Model/DayPlanMaterial.cs
index 7f45f2d..bc4cdcf 100644
--- a/src/Model/Demo.Model/Model/DayPlanMaterial.cs
+++ b/src/Model/Demo.Model/Model/DayPlanMaterial.cs
@@ -96,5 +96,11 @@
/// 鍙戞枡鏂瑰紡
/// </summary>
public string FIssueType { get; set; }
+
+ /// <summary>
+ /// 瀛愰」绫诲瀷
+ /// </summary>
+ public string FMaterialType { get; set; }
+
}
}
--
Gitblit v1.9.1