From 7af4d9d0181f2442bc60b218ec65bfaf831d0422 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 02 九月 2021 09:27:22 +0800
Subject: [PATCH] nothing
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index b9f2504..605cba2 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -39,7 +39,7 @@
{
LogHelper.Info("瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳锛�");
ImportData();
- WriteImportLog();
+ //WriteImportLog();
//this.View.ShowErrMessage("娴嬭瘯瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳");
}
@@ -123,36 +123,47 @@
for (int i = 0; i < dt.Rows.Count; i++)
{
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏(2.28+鐢熶骇璁㈠崟鏄庣粏琛屽彿楠岃瘉)
- string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
+ string sql = string.Format(@"/*dialect*/
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID
+join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}' and FSEQ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][2].ToString());
DataTable _dt = new DataTable();
_dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FMoFBillType = "";
if (_dt.Rows.Count > 0)
{
FLOT = _dt.Rows[0]["FLOT"].ToString();
FQTY = _dt.Rows[0]["FQTY"].ToString();
FBILLNO = _dt.Rows[0]["FBILLNO"].ToString();
+ FMoFBillType = _dt.Rows[0]["FMoFBillType"].ToString();
}
- //鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 + 鐢熶骇璁㈠崟琛屽彿 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙�
+ //鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 + 鐢熶骇璁㈠崟琛屽彿 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙� 鍜� 鍏抽棴鏁伴噺锛�6.18鏇达級
string fDayPlanID = "";
string fDayPlanBillNo = "";
- sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID
+ string fCloseCount = "";
+ 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 = a.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());
+ //LogHelper.Error(sql);
DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dayPlanDt.Rows.Count > 0)
{
fDayPlanID = dayPlanDt.Rows[0]["FID"].ToString();
fDayPlanBillNo = dayPlanDt.Rows[0]["FBILLNO"].ToString();
+ fCloseCount = dayPlanDt.Rows[0]["FCloseCount"].ToString();
+ fQtyLS = dayPlanDt.Rows[0]["FQTYLS"].ToString();
}
- //DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
+ this.Model.SetValue("FMoFBillType", FMoFBillType, i);
this.Model.SetValue("FSalOrderNo", dt.Rows[i][0].ToString(), i);
this.Model.SetValue("FSCOrderNo", dt.Rows[i][1].ToString(), i);
this.Model.SetItemValueByNumber("FORGID", "100", i);
@@ -169,6 +180,9 @@
this.Model.SetValue("FDayPlanID", fDayPlanID, i);//鏃ヨ鍒掑伐鍗旾D
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);
@@ -270,9 +284,27 @@
this.View.ShowErrMessage(_result);
return;
}
+ //鏍￠獙鐢熶骇鐢ㄦ枡娓呭崟鏄惁瀹℃牳
foreach (DynamicObject current in entityDataObjoct)
{
- if (Convert.ToInt32(current["FNoScheduled"]) < 0)
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"/*dialect*/SELECT FBILLNO FROM T_PRD_PPBOM T1
+WHERE T1.FMOBILLNO = '{0}' AND T1.FMATERIALID = '{1}' AND T1.FMOENTRYSEQ = '{2}' and FDOCUMENTSTATUS <>'C'
+", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ DataTable dt = new DataTable();
+ dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count > 0)
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + ",鐢熶骇璁㈠崟鏄庣粏琛屽彿锛�" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "鐗╂枡" + (current["FMatrailId"] as DynamicObject)["Number"] + "瀵瑰簲鐨勭敓浜х敤鏂欐竻鍗曪細" + dt.Rows[0][0] + "鏈鏍�";
+ }
+ if (_result != "")
+ {
+ this.View.ShowErrMessage(_result);
+ return;
+ }
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ //鏈帓鏁伴噺= 鎬绘暟 - 鏃ヨ鍒� 瓒呭嚭鏃ヨ鍒掍负璐� - 鍘嗗彶鏁伴噺 + 鍏抽棴鏁伴噺 < 0 琛ㄧず瓒呭嚭浜嗘�昏鍒掓暟閲�
+ if (Convert.ToInt32(current["FNoScheduled"]) - Convert.ToInt32(current["FQTYLS"]) + Convert.ToInt32(current["FCloseCount"]) < 0)
_result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鏃ヨ鍒掓�绘暟閲忚秴鍑虹敓浜ц鍗曟暟閲�";
}
if (_result != "")
@@ -287,9 +319,13 @@
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"
/*dialect*/
-SELECT 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
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
DataTable dt = new DataTable();
dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -303,6 +339,8 @@
string FHUnitID = "";//鍗曚綅
string FPlanBeginDate = "";//寮�濮嬫棩鏈�
string FPlanEndDate = "";//缁撴潫鏃ユ湡
+ string FMoFBillType = "";//
+ string FBomNumber = "";//Bom 鐗堟湰
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -313,6 +351,8 @@
FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
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", "");
@@ -322,7 +362,8 @@
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
- jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
+ jsonModel.Add("FPreparatDate", FPlanBeginDate);//缂栧埗鏃ユ湡(鏀逛负璁″垝寮�濮嬫棩鏈�)
+ jsonModel.Add("FMoFBillType", FMoFBillType);//
jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
@@ -330,16 +371,17 @@
jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
-
- jsonModel.Add("FHPlanBeginDate",FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ 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);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
@@ -400,8 +442,8 @@
}
else
{
- LogHelper.Error(jsonRoot.ToString());
- this.View.ShowErrMessage(jsonRoot.ToString());
+ LogHelper.Error(saveObj.ToString());
+ this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
}
else
@@ -431,7 +473,7 @@
}
else
{
- LogHelper.Error(jsonRoot.ToString());
+ this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
this.View.ShowErrMessage(jsonRoot.ToString());
}
}
@@ -492,7 +534,6 @@
}
return string.Empty;
}
-
public void WriteImportLog()
{
try
@@ -562,6 +603,8 @@
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
--
Gitblit v1.9.1