From 5ce2275b22855f5034c5b14d24c1415a52fa4734 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 13 四月 2021 16:40:03 +0800
Subject: [PATCH] 日计划用料清单新增日计划工单关联 生产计划排程 计算更改为分钟
---
src/Model/Demo.Model/Model/DayPlanMaterial.cs | 8 ++++++++
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 8 ++++++--
src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs | 14 +++++++-------
src/Model/Demo.Model/Model/ENG_WORKCALFULLDATA.cs | 7 ++++++-
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 91c3efa..281215d 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1507,7 +1507,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,
+ select t1.FID,t1.FSEQ FDayPlanFSEQ,t1.FEntryID,T2.FBILLNO AS FDayPlanFBILLNO,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,FMaterialType
FROM Sc_WorkBillSortBillSub t1
JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
@@ -1564,7 +1564,9 @@
FEntrustPickOrgId = dr["FORGNUMBER"].ToString(),
FMOID = dr["FMOID"].ToString(),
FIssueType = dr["FIssueType"].ToString(),
- FMaterialType = dr["FMaterialType"].ToString()
+ FMaterialType = dr["FMaterialType"].ToString(),
+ FDayPlanFSEQ = dr["FDayPlanFSEQ"].ToString(),
+ FDayPlanFBILLNO = dr["FDayPlanFBILLNO"].ToString()
});
}
LogHelper.Info($"鏃ヨ鍒掔敤鏂欐竻鍗曪紝鏁版嵁鍑嗗瀹屾垚锛屼繚瀛樺埌Model瀹炰綋锛屾�昏鏁帮細{DayPlanMaterial.Count}锛岃�楁椂锛�" + sw.Elapsed);
@@ -1585,6 +1587,8 @@
model.Add("FHQty", _DayPlanMaterial[0].FHQty);//涓讳骇鍝佹暟閲忥細FHQty
model.Add("FHUnitID", new JObject() { ["Fnumber"] = _DayPlanMaterial[0].FHUnitID });//鍗曚綅锛欶HUnitID
model.Add("FDayPlanFID", _DayPlanMaterial[0].FDayPlanFID);//鏃ヨ鍒掑伐鍗曞唴鐮�
+ model.Add("FDayPlanFSEQ", _DayPlanMaterial[0].FDayPlanFSEQ);//鏃ヨ鍒掑伐鍗曟槑缁嗚鍙�
+ model.Add("FDayPlanFBillNo", _DayPlanMaterial[0].FDayPlanFBILLNO);//鏃ヨ鍒掑伐鍗曞崟鎹紪鍙�
JArray Entry = new JArray();
int FSEQ = 1;
foreach (var _item in _DayPlanMaterial)
diff --git a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
index 0bf4e8f..b249563 100644
--- a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
+++ b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
@@ -320,7 +320,7 @@
{
//鏌ヨ鍑洪噸澶嶇敓浜х嚎瀵瑰簲鐨勫伐浣滄棩鍘嗕俊鎭�
string _sql = @"
-select FCalUserId,FCalUserType,FShiftId,FIsWorkTime,FDay,FDateStyle,c.FALLHOURS,b.FENTRYID from T_ENG_WORKCAL a
+select FCalUserId,FCalUserType,FShiftId,FIsWorkTime,FDay,FDateStyle,c.FALLHOURS ,c.FALLHOURS FALLHOURSCONST,b.FENTRYID from T_ENG_WORKCAL a
left join T_ENG_WORKCALFULLDATA b on a.FID=b.FID
left join T_ENG_SHIFT c on b.FShiftId =c.FID
where FDateStyle = 1 and FIsWorkTime = 1
@@ -344,26 +344,26 @@
decimal FCapacity = Convert.ToDecimal(order["FCapacity"]);//灏忔椂浜ц兘
decimal FSCOrderCount = Convert.ToDecimal(order["FSCOrderCount"]);//鐢熶骇璁㈠崟鏁�
List<ENG_WORKCALFULLDATA> finalyResult = new List<ENG_WORKCALFULLDATA>();
- decimal dayFCapacity = 0;//鏃ヤ骇閲�
+ decimal dayFCapacity = 0;//褰撴棩鍓╀綑浜ч噺 = 灏忔椂浜ц兘 * 鏃ュ墿浣欏伐浣滄椂闀�
List<ENG_WORKCALFULLDATA> _ENG_WORKCALFULLDATA = ENG_WORKCALFULLDATA.Where(x => x.FALLHOURS > 0 && x.FCalUserId == Convert.ToInt32(order["FSczy_Id"])).ToList();
foreach (var item in _ENG_WORKCALFULLDATA)
{
if (FSCOrderCount == 0)
break;
- dayFCapacity = FCapacity * item.FALLHOURS;
+ dayFCapacity = FCapacity * item.FALLHOURS;
decimal fqty = dayFCapacity > FSCOrderCount ? FSCOrderCount : dayFCapacity;
finalyResult.Add(new Demo.Model.Model.ENG_WORKCALFULLDATA
{
FDay = item.FDay,
FQTY = fqty
}); ;
- //褰撴棩浜ч噺澶т簬鍓╀綑鐢熶骇璁㈠崟鏁伴噺鏃� 鎸夊皬鏃朵骇閲忓幓璁＄畻闇�瑕佹椂闂� list<>鍘绘墸闄ょ浉搴旂殑宸ユ椂
+ //褰撴棩鍓╀綑浜ч噺澶т簬鍓╀綑鐢熶骇璁㈠崟鏁伴噺鏃� 鎸夊皬鏃朵骇閲忓幓璁＄畻闇�瑕佹椂闂� list<>鍘绘墸闄ょ浉搴旂殑宸ユ椂
if (dayFCapacity > FSCOrderCount)
{
//鏀瑰彉list涓煇涓厓绱犲��
var model = ENG_WORKCALFULLDATA.Where(c => c.FENTRYID == item.FENTRYID).FirstOrDefault();
- model.FALLHOURS -= Math.Ceiling(fqty / FCapacity);
-
+ //model.FALLHOURS -= Math.Ceiling(fqty / FCapacity);
+ model.FALLHOURS -= fqty / FCapacity ; // 鐢熶骇鏁� / 灏忔椂浜ц兘 = 娑堣�楃殑灏忔椂 锛堟暟鍊肩被鍨嬩负decimal锛�
}
else
{
@@ -400,7 +400,7 @@
jsonRoot.Add("Creator", "");
jsonRoot.Add("NeedUpDateFields", new JArray());
jsonRoot.Add("NeedReturnFields", new JArray());
- jsonRoot.Add("IsDeleteEntry", "false");//
+ jsonRoot.Add("IsDeleteEntry", "true");//
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
diff --git a/src/Model/Demo.Model/Model/DayPlanMaterial.cs b/src/Model/Demo.Model/Model/DayPlanMaterial.cs
index bc4cdcf..b3835a5 100644
--- a/src/Model/Demo.Model/Model/DayPlanMaterial.cs
+++ b/src/Model/Demo.Model/Model/DayPlanMaterial.cs
@@ -101,6 +101,14 @@
/// 瀛愰」绫诲瀷
/// </summary>
public string FMaterialType { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掓槑缁嗚鍙�
+ /// </summary>
+ public string FDayPlanFSEQ { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曞崟鍙�
+ /// </summary>
+ public string FDayPlanFBILLNO { get; set; }
}
}
diff --git a/src/Model/Demo.Model/Model/ENG_WORKCALFULLDATA.cs b/src/Model/Demo.Model/Model/ENG_WORKCALFULLDATA.cs
index 0c7ddad..85cc5f1 100644
--- a/src/Model/Demo.Model/Model/ENG_WORKCALFULLDATA.cs
+++ b/src/Model/Demo.Model/Model/ENG_WORKCALFULLDATA.cs
@@ -39,11 +39,16 @@
public long FDateStyle { get; set; }
/// <summary>
- /// 宸ヤ綔鏃堕暱
+ /// 宸ヤ綔鏃堕暱(鐢ㄤ簬璁＄畻)
/// </summary>
public decimal FALLHOURS { get; set; }
/// <summary>
+ /// 姣忔棩宸ヤ綔鏃堕暱 鍥哄畾鍊� 涓嶅仛鏇存敼
+ /// </summary>
+ public decimal FALLHOURSCONST { get; set; }
+
+ /// <summary>
/// 鏃ヤ骇閲�
/// </summary>
public decimal FQTY { get; set; }
--
Gitblit v1.9.1