From b8606a18a49078d0a800855a454391953c886c4f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 24 二月 2021 17:24:52 +0800
Subject: [PATCH] NOTHING
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 20 +++++++++++++-------
src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs | 2 +-
src/BLL/Demo.BillView/PRD/Pro_PPBomSubmit.cs | 2 +-
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
index 7a4d035..c0bc9db 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
@@ -256,7 +256,7 @@
linkRow["RuleId"] = "PRD_PPBOM2PICKMTRL_NORMAL";
linkRow["SBillId"] = ((DynamicObject)srcRow.Parent)[0];
linkRow["STableId"] = ((DynamicObject)srcRow.Parent)[0];
- linkRow["SId"] = srcRow[0];
+ linkRow["SId"] = toRow["PPBomEntryId"];
linkRow["BaseActualQtyOld"] = remainQty;
linkRow["BaseActualQty"] = toRow["ACTUALQTY"]; //鍩烘湰鍗曚綅瀹炲彂鏁伴噺
diff --git a/src/BLL/Demo.BillView/PRD/Pro_PPBomSubmit.cs b/src/BLL/Demo.BillView/PRD/Pro_PPBomSubmit.cs
index cf0a1b7..ee74507 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_PPBomSubmit.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_PPBomSubmit.cs
@@ -63,7 +63,7 @@
DBServiceHelper.Execute(Context, sql);
sql = string.Format(@"
/*dialect*/
- 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,t4.FNumerator,t4.FDenominator,convert(decimal(18,2),(t4.FNumerator/t4.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,t4.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,t4.FNumerator,t4.FDenominator,convert(decimal(18,2),(t4.FMustQty/T3.FQTY) *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,t4.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,Tc.FIssueType,t4.FMaterialType,t12.FEntryID
as FDayPlanPpbomFEntryId
FROM Sc_WorkBillSortBillSub t1
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 405850f..918a0c9 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -148,7 +148,8 @@
string fDayPlanID = "";
string fDayPlanBillNo = "";
string fCloseCount = "";
- sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID,a.FCloseCount from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
+ string fQtyLS = "";
+ sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID,a.FCloseCount,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
left join T_ENG_WORKCENTER c on a.FHSourceID=c.fid
where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and a.FSRCBILLENTRYSEQ ='{3}' and (isnull(c.FNUMBER,'') ='{2}' or (select count(*) from T_ENG_WORKCENTER where isnull(c.FNUMBER,'') ='{2}')=0)", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString(), dt.Rows[i][2].ToString());
DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -157,6 +158,7 @@
fDayPlanID = dayPlanDt.Rows[0]["FID"].ToString();
fDayPlanBillNo = dayPlanDt.Rows[0]["FBILLNO"].ToString();
fCloseCount = dayPlanDt.Rows[0]["FCloseCount"].ToString();
+ fQtyLS = dayPlanDt.Rows[0]["FCloseCount"].ToString();
}
//DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
@@ -179,6 +181,8 @@
this.Model.SetValue("FDayPlanBillNo", fDayPlanBillNo, i);//鏃ュ伐鍗曠紪鍙�
this.Model.SetValue("FSRCBILLENTRYSEQ", dt.Rows[i][2].ToString(), i);//鐢熶骇璁㈠崟鏄庣粏琛屽彿
this.Model.SetValue("FCloseCount", fCloseCount, i);//鍏抽棴鏁伴噺
+ this.Model.SetValue("FQTYLS", fQtyLS, i);//鍘嗗彶閬楃暀
+
for (int j = 0; j <= 60; j++)
{
this.Model.SetValue("FT" + "" + j + "", dt.Rows[i][15 + j].ToString(), i);
@@ -299,9 +303,9 @@
}
foreach (DynamicObject current in entityDataObjoct)
{
- //鏈帓鏁伴噺= 鎬绘暟 - 鏃ヨ鍒� 瓒呭嚭鏃ヨ鍒掍负璐� + 鍏抽棴鏁伴噺 < 0 琛ㄧず瓒呭嚭浜嗘�昏鍒掓暟閲�
- if (Convert.ToInt32(current["FNoScheduled"]) + Convert.ToInt32(current["FCloseCount"]) < 0)
- _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�+鍏抽棴鏁伴噺";
+ //鏈帓鏁伴噺= 鎬绘暟 - 鏃ヨ鍒� 瓒呭嚭鏃ヨ鍒掍负璐� - 鍘嗗彶鏁伴噺 + 鍏抽棴鏁伴噺 < 0 琛ㄧず瓒呭嚭浜嗘�昏鍒掓暟閲�
+ if (Convert.ToInt32(current["FNoScheduled"]) - Convert.ToInt32(current["FQTYLS"]) + Convert.ToInt32(current["FCloseCount"]) < 0)
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
}
if (_result != "")
{
@@ -315,8 +319,9 @@
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"
/*dialect*/
-SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber,tBom.FNUMBER as FBomNumber FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
+ LEFT JOIN T_ENG_BOM tBom on t2.FBOMID = tBom.FID
join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
@@ -335,6 +340,7 @@
string FPlanBeginDate = "";//寮�濮嬫棩鏈�
string FPlanEndDate = "";//缁撴潫鏃ユ湡
string FMoFBillType = "";//
+ string FBomNumber = "";//Bom 鐗堟湰
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -346,6 +352,7 @@
FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
FMoFBillType = dt.Rows[0]["FMoFBillType"].ToString();
+ FBomNumber = dt.Rows[0]["FBomNumber"].ToString();
}
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -364,10 +371,9 @@
jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
-
+ jsonModel.Add("FBOMID", new JObject() { ["Fnumber"] = FBomNumber });//BOM鐗堟湰
jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
-
//jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 935d741..cc6e4f1 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1845,7 +1845,7 @@
{
string sql = string.Format(@"
/*dialect*/
- 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,
+ 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),(t4.FMustQty/T3.FQTY) *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,td.FNUMBER as FWORKSHOPID
FROM Sc_WorkBillSortBillSub t1
JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
--
Gitblit v1.9.1