|
|
@@ -22690,8 +22690,9 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
new OracleParameter(":workdataid", workdataid),
|
|
|
};
|
|
|
r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
+ }
|
|
|
|
|
|
- sqlString = "SELECT TO_CHAR(wd.yyyymmdd) yyyymmdd\n" +
|
|
|
+ sqlString = "SELECT TO_CHAR(wd.yyyymmdd) yyyymmdd\n" +
|
|
|
" ,TO_CHAR(5000) WERKS\n" +
|
|
|
" ,TO_CHAR(wd.goodscode) GROES\n" +
|
|
|
" ,TO_CHAR(wd.sapcode) MATNR\n" +
|
|
|
@@ -22718,48 +22719,49 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
" INNER JOIN TSAP_HEGII_DATALOG_BG DL\n" +
|
|
|
" ON wd.LOGID = DL.LOGID \n" +
|
|
|
" WHERE wd.logid = :logid";
|
|
|
- OracleParameter[] par = null;
|
|
|
- par = new OracleParameter[]
|
|
|
- {
|
|
|
+ OracleParameter[] par = null;
|
|
|
+ par = new OracleParameter[]
|
|
|
+ {
|
|
|
new OracleParameter(":logid", OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
new OracleParameter(":yyyymmdd",yyyymmdd),
|
|
|
- };
|
|
|
+ };
|
|
|
|
|
|
- DataTable dtt = oracleTrConn.GetSqlResultToDt(sqlString, par);
|
|
|
- int num = dtt.Rows.Count;
|
|
|
+ DataTable dtt = oracleTrConn.GetSqlResultToDt(sqlString, par);
|
|
|
+ int num = dtt.Rows.Count;
|
|
|
|
|
|
- string sq = "select SAP_INI_BG from TP_SYS_SAPCONFIG";
|
|
|
- string SAP_ING_NEW = oracleTrConn.GetSqlResultToStr(sq);
|
|
|
- if (SAP_ING_NEW == "1")
|
|
|
+ string sq = "select SAP_INI_BG from TP_SYS_SAPCONFIG";
|
|
|
+ string SAP_ING_NEW = oracleTrConn.GetSqlResultToStr(sq);
|
|
|
+ //if (SAP_ING_NEW == "1")
|
|
|
+ if (true)
|
|
|
+ {
|
|
|
+ // 调用SAP接口
|
|
|
+ string postString = "{\"ZSUM\":" + num.ToString() + ",\"TABLE_IN\":{\"item\":" + JsonHelper.ToJson(ModelConvertHelper<BGToSAP>.ConvertToModel(dtt)) + "}}";
|
|
|
+ INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
|
|
|
+ string url030 = ini.ReadIniData("SAP_NEW_INFO", "Url030");
|
|
|
+ //string url030 = "http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM030";
|
|
|
+ string result = SAPDataLogic.PostData(url030, postString, "POST");
|
|
|
+ if (JObject.Parse(result)["TABLE_OUT"] != null && JObject.Parse(result)["TABLE_OUT"].ToString().Length > 0)
|
|
|
{
|
|
|
- // 调用SAP接口
|
|
|
- string postString = "{\"ZSUM\":" + num.ToString() + ",\"TABLE_IN\":{\"item\":" + JsonHelper.ToJson(ModelConvertHelper<BGToSAP>.ConvertToModel(dtt)) + "}}";
|
|
|
- INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
|
|
|
- string url030 = ini.ReadIniData("SAP_NEW_INFO", "Url030");
|
|
|
- //string url030 = "http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM030";
|
|
|
- string result = SAPDataLogic.PostData(url030, postString, "POST");
|
|
|
- if (JObject.Parse(result)["TABLE_OUT"] != null && JObject.Parse(result)["TABLE_OUT"].ToString().Length > 0)
|
|
|
- {
|
|
|
- sqlString = "update TSAP_HEGII_WorkData_bg t set t.ZTime =sysdate, ZTYPE = :ZTYPE, ZMSG = :ZMSG where logid = " + logid_bg +
|
|
|
- " \n and YYYYMMDD='" + yyyymmdd + "' and WorkCode='" + workcode +
|
|
|
- "' and DataCode='60' and GoodsCode=:GoodsCode and SAPCode=:SAPCode and UserCode=:UserCode \n" +
|
|
|
- "and OrderCode=:OrderCode and OrderItem=:OrderItem";
|
|
|
- Dictionary<string, object> obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
|
|
|
+ sqlString = "update TSAP_HEGII_WorkData_bg t set t.ZTime =sysdate, ZTYPE = :ZTYPE, ZMSG = :ZMSG where logid = " + logid_bg +
|
|
|
+ " \n and YYYYMMDD='" + yyyymmdd + "' and WorkCode='" + workcode +
|
|
|
+ "' and DataCode='60' and GoodsCode=:GoodsCode and SAPCode=:SAPCode and UserCode=:UserCode \n" +
|
|
|
+ "and OrderCode=:OrderCode and OrderItem=:OrderItem";
|
|
|
+ Dictionary<string, object> obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
|
|
|
|
|
|
- object TABLE_OUT;
|
|
|
- obj.TryGetValue("TABLE_OUT", out TABLE_OUT);
|
|
|
+ object TABLE_OUT;
|
|
|
+ obj.TryGetValue("TABLE_OUT", out TABLE_OUT);
|
|
|
|
|
|
- obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(TABLE_OUT + "");
|
|
|
- object item1;
|
|
|
- obj.TryGetValue("item", out item1);
|
|
|
+ obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(TABLE_OUT + "");
|
|
|
+ object item1;
|
|
|
+ obj.TryGetValue("item", out item1);
|
|
|
|
|
|
- JArray arr = JArray.FromObject(item1);
|
|
|
+ JArray arr = JArray.FromObject(item1);
|
|
|
|
|
|
- foreach (JObject item60 in arr)
|
|
|
+ foreach (JObject item60 in arr)
|
|
|
+ {
|
|
|
+ string posnr = item60["POSNR"].ToString().TrimStart('0');
|
|
|
+ oracleParameter = new OracleParameter[]
|
|
|
{
|
|
|
- string posnr = item60["POSNR"].ToString().TrimStart('0');
|
|
|
- oracleParameter = new OracleParameter[]
|
|
|
- {
|
|
|
new OracleParameter(":ZTYPE",OracleDbType.Varchar2, item60["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":ZMSG",OracleDbType.Varchar2, item60["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":GoodsCode",OracleDbType.Varchar2, item60["GROES"].ToString(), ParameterDirection.Input),
|
|
|
@@ -22767,36 +22769,35 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
new OracleParameter(":UserCode",OracleDbType.Varchar2, item60["ZGHNU"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":OrderCode",OracleDbType.Varchar2, (string.IsNullOrEmpty(item60["VBELN"].ToString()) ? " " : item60["VBELN"].ToString()), ParameterDirection.Input),
|
|
|
new OracleParameter(":Orderitem",OracleDbType.Varchar2, ((string.IsNullOrEmpty(posnr)) ? "0" : posnr), ParameterDirection.Input),
|
|
|
- };
|
|
|
- r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
- }
|
|
|
-
|
|
|
- //:msg||chr(13)||DataMSG
|
|
|
- JObject.Parse(result)["ZMSG"] = $"{JObject.Parse(result)["ZMSG"]}(" + num + ")";
|
|
|
- sqlString = "update tsap_hegii_datalog_bg t set t.EndTime = sysdate, DataStuts = :DataStuts, DataMSG =nvl2(:msg,:msg||' '||chr(13)||DataMSG,DataMSG) where logid = :logid";
|
|
|
- oracleParameter = new OracleParameter[]
|
|
|
- {
|
|
|
- new OracleParameter(":DataStuts",OracleDbType.Varchar2, JObject.Parse(result)["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
- new OracleParameter(":msg",OracleDbType.Varchar2, JObject.Parse(result)["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
- new OracleParameter(":logid",OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
};
|
|
|
r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
}
|
|
|
|
|
|
- if (JObject.Parse(result)["ZTYPE"].ToString() != "S")
|
|
|
+ //:msg||chr(13)||DataMSG
|
|
|
+ JObject.Parse(result)["ZMSG"] = $"{JObject.Parse(result)["ZMSG"]}(" + num + ")";
|
|
|
+ sqlString = "update tsap_hegii_datalog_bg t set t.EndTime = sysdate, DataStuts = :DataStuts, DataMSG =nvl2(:msg,:msg||' '||chr(13)||DataMSG,DataMSG) where logid = :logid";
|
|
|
+ oracleParameter = new OracleParameter[]
|
|
|
{
|
|
|
- sre.Result = -2;
|
|
|
- sre.Message = "同步产量失败," + JObject.Parse(result)["ZMSG"].ToString();
|
|
|
- return sre;
|
|
|
- }
|
|
|
-
|
|
|
- //sqlString =
|
|
|
- //"UPDATE tp_pm_groutingdailydetail bar\n" +
|
|
|
- //" SET bar.issync = '1'\n" +
|
|
|
- //" WHERE 1 = 1" + fifter;
|
|
|
+ new OracleParameter(":DataStuts",OracleDbType.Varchar2, JObject.Parse(result)["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
+ new OracleParameter(":msg",OracleDbType.Varchar2, JObject.Parse(result)["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
+ new OracleParameter(":logid",OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
+ };
|
|
|
+ r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
+ }
|
|
|
|
|
|
- //r = oracleTrConn.ExecuteNonQuery(sqlString);
|
|
|
+ if (JObject.Parse(result)["ZTYPE"].ToString() != "S")
|
|
|
+ {
|
|
|
+ sre.Result = -2;
|
|
|
+ sre.Message = "同步产量失败," + JObject.Parse(result)["ZMSG"].ToString();
|
|
|
+ return sre;
|
|
|
}
|
|
|
+
|
|
|
+ //sqlString =
|
|
|
+ //"UPDATE tp_pm_groutingdailydetail bar\n" +
|
|
|
+ //" SET bar.issync = '1'\n" +
|
|
|
+ //" WHERE 1 = 1" + fifter;
|
|
|
+
|
|
|
+ //r = oracleTrConn.ExecuteNonQuery(sqlString);
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
@@ -23763,7 +23764,9 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
};
|
|
|
r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
|
|
|
- sqlString = "SELECT TO_CHAR(wd.yyyymmdd) yyyymmdd\n" +
|
|
|
+
|
|
|
+ }
|
|
|
+ sqlString = "SELECT TO_CHAR(wd.yyyymmdd) yyyymmdd\n" +
|
|
|
" ,TO_CHAR(5000) WERKS\n" +
|
|
|
" ,TO_CHAR(wd.goodscode) GROES\n" +
|
|
|
" ,TO_CHAR(wd.sapcode) MATNR\n" +
|
|
|
@@ -23790,48 +23793,48 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
" INNER JOIN TSAP_HEGII_DATALOG_BG DL\n" +
|
|
|
" ON wd.LOGID = DL.LOGID \n" +
|
|
|
" WHERE wd.logid = :logid";
|
|
|
- OracleParameter[] par = null;
|
|
|
- par = new OracleParameter[]
|
|
|
- {
|
|
|
+ OracleParameter[] par = null;
|
|
|
+ par = new OracleParameter[]
|
|
|
+ {
|
|
|
new OracleParameter(":logid", OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
new OracleParameter(":yyyymmdd",yyyymmdd),
|
|
|
- };
|
|
|
+ };
|
|
|
|
|
|
- DataTable dtt = oracleTrConn.GetSqlResultToDt(sqlString, par);
|
|
|
- int num = dtt.Rows.Count;
|
|
|
+ DataTable dtt = oracleTrConn.GetSqlResultToDt(sqlString, par);
|
|
|
+ int num = dtt.Rows.Count;
|
|
|
|
|
|
- string sq = "select SAP_INI_BG from TP_SYS_SAPCONFIG";
|
|
|
- string SAP_ING_NEW = oracleTrConn.GetSqlResultToStr(sq);
|
|
|
- if (SAP_ING_NEW == "1")
|
|
|
+ string sq = "select SAP_INI_BG from TP_SYS_SAPCONFIG";
|
|
|
+ string SAP_ING_NEW = oracleTrConn.GetSqlResultToStr(sq);
|
|
|
+ if (SAP_ING_NEW == "1")
|
|
|
+ {
|
|
|
+ // 调用SAP接口
|
|
|
+ string postString = "{\"ZSUM\":" + num.ToString() + ",\"TABLE_IN\":{\"item\":" + JsonHelper.ToJson(ModelConvertHelper<BGToSAP>.ConvertToModel(dtt)) + "}}";
|
|
|
+ INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
|
|
|
+ string url030 = ini.ReadIniData("SAP_NEW_INFO", "Url030");
|
|
|
+ //string url030 = "http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM030";
|
|
|
+ string result = SAPDataLogic.PostData(url030, postString, "POST");
|
|
|
+ if (JObject.Parse(result)["TABLE_OUT"] != null && JObject.Parse(result)["TABLE_OUT"].ToString().Length > 0)
|
|
|
{
|
|
|
- // 调用SAP接口
|
|
|
- string postString = "{\"ZSUM\":" + num.ToString() + ",\"TABLE_IN\":{\"item\":" + JsonHelper.ToJson(ModelConvertHelper<BGToSAP>.ConvertToModel(dtt)) + "}}";
|
|
|
- INIUtility ini = INIUtility.Instance(INIUtility.IniFile.SAP_HEGII);
|
|
|
- string url030 = ini.ReadIniData("SAP_NEW_INFO", "Url030");
|
|
|
- //string url030 = "http://hgs4podev.hegii.com:50200/RESTAdapter/DKMES/ZPPFM030";
|
|
|
- string result = SAPDataLogic.PostData(url030, postString, "POST");
|
|
|
- if (JObject.Parse(result)["TABLE_OUT"] != null && JObject.Parse(result)["TABLE_OUT"].ToString().Length > 0)
|
|
|
- {
|
|
|
- sqlString = "update TSAP_HEGII_WorkData_bg t set t.ZTime =sysdate, ZTYPE = :ZTYPE, ZMSG = :ZMSG where logid = " + logid_bg +
|
|
|
- " \n and YYYYMMDD='" + yyyymmdd + "' and WorkCode='" + workcode +
|
|
|
- "' and DataCode='60' and GoodsCode=:GoodsCode and SAPCode=:SAPCode and UserCode=:UserCode \n" +
|
|
|
- "and OrderCode=:OrderCode and OrderItem=:OrderItem";
|
|
|
- Dictionary<string, object> obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
|
|
|
+ sqlString = "update TSAP_HEGII_WorkData_bg t set t.ZTime =sysdate, ZTYPE = :ZTYPE, ZMSG = :ZMSG where logid = " + logid_bg +
|
|
|
+ " \n and YYYYMMDD='" + yyyymmdd + "' and WorkCode='" + workcode +
|
|
|
+ "' and DataCode='60' and GoodsCode=:GoodsCode and SAPCode=:SAPCode and UserCode=:UserCode \n" +
|
|
|
+ "and OrderCode=:OrderCode and OrderItem=:OrderItem";
|
|
|
+ Dictionary<string, object> obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(result);
|
|
|
|
|
|
- object TABLE_OUT;
|
|
|
- obj.TryGetValue("TABLE_OUT", out TABLE_OUT);
|
|
|
+ object TABLE_OUT;
|
|
|
+ obj.TryGetValue("TABLE_OUT", out TABLE_OUT);
|
|
|
|
|
|
- obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(TABLE_OUT + "");
|
|
|
- object item1;
|
|
|
- obj.TryGetValue("item", out item1);
|
|
|
+ obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(TABLE_OUT + "");
|
|
|
+ object item1;
|
|
|
+ obj.TryGetValue("item", out item1);
|
|
|
|
|
|
- JArray arr = JArray.FromObject(item1);
|
|
|
+ JArray arr = JArray.FromObject(item1);
|
|
|
|
|
|
- foreach (JObject item60 in arr)
|
|
|
+ foreach (JObject item60 in arr)
|
|
|
+ {
|
|
|
+ string posnr = item60["POSNR"].ToString().TrimStart('0');
|
|
|
+ oracleParameter = new OracleParameter[]
|
|
|
{
|
|
|
- string posnr = item60["POSNR"].ToString().TrimStart('0');
|
|
|
- oracleParameter = new OracleParameter[]
|
|
|
- {
|
|
|
new OracleParameter(":ZTYPE",OracleDbType.Varchar2, item60["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":ZMSG",OracleDbType.Varchar2, item60["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":GoodsCode",OracleDbType.Varchar2, item60["GROES"].ToString(), ParameterDirection.Input),
|
|
|
@@ -23839,35 +23842,34 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
new OracleParameter(":UserCode",OracleDbType.Varchar2, item60["ZGHNU"].ToString(), ParameterDirection.Input),
|
|
|
new OracleParameter(":OrderCode",OracleDbType.Varchar2, (string.IsNullOrEmpty(item60["VBELN"].ToString()) ? " " : item60["VBELN"].ToString()), ParameterDirection.Input),
|
|
|
new OracleParameter(":Orderitem",OracleDbType.Varchar2, ((string.IsNullOrEmpty(posnr)) ? "0" : posnr), ParameterDirection.Input),
|
|
|
- };
|
|
|
- r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
- }
|
|
|
-
|
|
|
- //:msg||chr(13)||DataMSG
|
|
|
- JObject.Parse(result)["ZMSG"] = $"{JObject.Parse(result)["ZMSG"]}({num})";
|
|
|
- sqlString = "update tsap_hegii_datalog_bg t set t.EndTime = sysdate, DataStuts = :DataStuts, DataMSG =nvl2(:msg,:msg||' '||chr(13)||DataMSG,DataMSG) where logid = :logid";
|
|
|
- oracleParameter = new OracleParameter[]
|
|
|
- {
|
|
|
- new OracleParameter(":DataStuts",OracleDbType.Varchar2, JObject.Parse(result)["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
- new OracleParameter(":msg",OracleDbType.Varchar2, JObject.Parse(result)["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
- new OracleParameter(":logid",OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
};
|
|
|
r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
}
|
|
|
|
|
|
- if (JObject.Parse(result)["ZTYPE"].ToString() != "S")
|
|
|
+ //:msg||chr(13)||DataMSG
|
|
|
+ JObject.Parse(result)["ZMSG"] = $"{JObject.Parse(result)["ZMSG"]}({num})";
|
|
|
+ sqlString = "update tsap_hegii_datalog_bg t set t.EndTime = sysdate, DataStuts = :DataStuts, DataMSG =nvl2(:msg,:msg||' '||chr(13)||DataMSG,DataMSG) where logid = :logid";
|
|
|
+ oracleParameter = new OracleParameter[]
|
|
|
{
|
|
|
- sre.Result = -2;
|
|
|
- sre.Message = "同步产量失败," + JObject.Parse(result)["ZMSG"].ToString();
|
|
|
- return sre;
|
|
|
- }
|
|
|
- //sqlString =
|
|
|
- //"UPDATE tp_pm_groutingdailydetail bar\n" +
|
|
|
- //" SET bar.issync = '1'\n" +
|
|
|
- //" WHERE 1 = 1" + fifter;
|
|
|
+ new OracleParameter(":DataStuts",OracleDbType.Varchar2, JObject.Parse(result)["ZTYPE"].ToString(), ParameterDirection.Input),
|
|
|
+ new OracleParameter(":msg",OracleDbType.Varchar2, JObject.Parse(result)["ZMSG"].ToString(), ParameterDirection.Input),
|
|
|
+ new OracleParameter(":logid",OracleDbType.Int32, logid_bg, ParameterDirection.Input),
|
|
|
+ };
|
|
|
+ r = oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
|
|
|
+ }
|
|
|
|
|
|
- //r = oracleTrConn.ExecuteNonQuery(sqlString);
|
|
|
+ if (JObject.Parse(result)["ZTYPE"].ToString() != "S")
|
|
|
+ {
|
|
|
+ sre.Result = -2;
|
|
|
+ sre.Message = "同步产量失败," + JObject.Parse(result)["ZMSG"].ToString();
|
|
|
+ return sre;
|
|
|
}
|
|
|
+ //sqlString =
|
|
|
+ //"UPDATE tp_pm_groutingdailydetail bar\n" +
|
|
|
+ //" SET bar.issync = '1'\n" +
|
|
|
+ //" WHERE 1 = 1" + fifter;
|
|
|
+
|
|
|
+ //r = oracleTrConn.ExecuteNonQuery(sqlString);
|
|
|
}
|
|
|
}
|
|
|
#endregion
|