From 16c4f4c84653feead5c62e124fafcb254e3827b9 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 08 九月 2021 13:25:10 +0800
Subject: [PATCH] nothing
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index ade1519..b0dd09c 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("娴嬭瘯瀵煎叆鍔熻兘鐐瑰嚮鎸夐挳");
}
@@ -145,14 +145,19 @@
FMoFBillType = _dt.Rows[0]["FMoFBillType"].ToString();
}
//鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 + 鐢熶骇璁㈠崟琛屽彿 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙� 鍜� 鍏抽棴鏁伴噺锛�6.18鏇达級
+ //9.2 鍏抽棴鐨勬棩璁″垝闇�瑕佹帓闄�
string fDayPlanID = "";
string fDayPlanBillNo = "";
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);
+ sql = string.Format(@"/*dialect*/
+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 A.FDOCUMENTSTATUS NOT IN ('E') AND
+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)
{
@@ -161,7 +166,6 @@
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);
@@ -269,9 +273,10 @@
}
int res = DBServiceHelper.ExecuteBatch(Context, sqlList);
string _result = "";
+ //楠岃瘉鏄惁鏈夌敓浜ц鍗曟槑缁嗚
foreach (DynamicObject current in entityDataObjoct)
{
- //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鐢熶骇璁㈠崟鏄庣粏鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
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"]));
@@ -317,7 +322,7 @@
{
if (string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
continue;
- //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ //鏌ヨ鐢熶骇璁㈠崟鏁版嵁
sql = string.Format(@"
/*dialect*/
SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber,tBom.FNUMBER as FBomNumber FROM T_PRD_MO T1
@@ -363,7 +368,7 @@
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
@@ -443,8 +448,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
@@ -474,8 +479,8 @@
}
else
{
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏� 鏂板寮傚父锛�" + saveObj.ToString());
this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
- this.View.ShowErrMessage(jsonRoot.ToString());
}
}
this.View.UpdateView();
--
Gitblit v1.9.1