From 8441cb4fa22c4d49b3334ea6c1aad5eb06b23d63 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 02 三月 2021 10:32:10 +0800
Subject: [PATCH] 提料计划拆分采购订单按照时间顺序去拆分
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 9a48620..b437e1c 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1742,17 +1742,17 @@
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>();
//sql闆嗗悎 鏇存柊閲囪喘璁㈠崟鍗犵敤鐨勬彁鏂欒鍒掓暟閲�
List<string> sqlList = new List<string>();
//MaterialIDList = new List<string> { "105773" };
- foreach (var item in MaterialIDList)
+ 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);
@@ -1774,7 +1774,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);
@@ -1786,9 +1786,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 + "");
@@ -1801,7 +1801,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)
@@ -1851,13 +1852,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
@@ -2049,8 +2050,8 @@
FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //閲囪喘璁㈠崟鍙凤細FHPOOrderBillNo
FentityModel.Add("FERPCLSID", _item.FErpClsID); //鍙戞枡鏂瑰紡
FentityModel.Add("FSEQ", FSEQ); //鍙戞枡鏂瑰紡
- FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs"}); //鍙戞枡鏂瑰紡
-
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //鍙戞枡鏂瑰紡
+
Fentity.Add(FentityModel);
FSEQ++;
}
--
Gitblit v1.9.1