|
|
@@ -660,30 +660,36 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
/// 注浆登记保存 ok
|
|
|
/// </summary>
|
|
|
/// <param name="groutingData">
|
|
|
- /*
|
|
|
- "groutingData": {
|
|
|
- "GROUTINGDATE": "注浆日期",
|
|
|
- "GROUTINGLINECODE": "成型线号",
|
|
|
- "GROUTINGTIMES": "注浆次数",
|
|
|
- "GROUTINGLINEDETAIL": [
|
|
|
- {
|
|
|
- "GROUTINGMOULDCODE": "注浆模具编1号",
|
|
|
- "GROUTINGFLAG": "注浆标识1",
|
|
|
- "NOGROUTINGRREASON": "未注浆原因1"
|
|
|
- },
|
|
|
- {
|
|
|
- "GROUTINGMOULDCODE": "注浆模具编号2",
|
|
|
- "GROUTINGFLAG": "注浆标识2",
|
|
|
- "NOGROUTINGRREASON": "未注浆原因2"
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- */
|
|
|
+ /*
|
|
|
+ "groutingData": {
|
|
|
+ "GROUTINGDATE": "注浆日期",
|
|
|
+ "GROUTINGLINECODE": "成型线号",
|
|
|
+ "GROUTINGTIMES": "注浆次数",
|
|
|
+ "GROUTINGLINEDETAIL": [
|
|
|
+ {
|
|
|
+ "GROUTINGMOULDCODE": "注浆模具编1号",
|
|
|
+ "GROUTINGFLAG": "注浆标识1",
|
|
|
+ "NOGROUTINGRREASON": "未注浆原因1"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "GROUTINGMOULDCODE": "注浆模具编号2",
|
|
|
+ "GROUTINGFLAG": "注浆标识2",
|
|
|
+ "NOGROUTINGRREASON": "未注浆原因2"
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ */
|
|
|
/// </param>
|
|
|
/// <param name="sUser"></param>
|
|
|
/// <returns></returns>
|
|
|
public static ServiceResultEntity SetGroutingLineDetail(string groutingData, SUserInfo sUser)
|
|
|
{
|
|
|
+ OutputLog.TraceLog(LogPriority.Information,
|
|
|
+ "",
|
|
|
+ System.Reflection.MethodBase.GetCurrentMethod().Name,
|
|
|
+ "【注浆开始】" + groutingData,
|
|
|
+ LocalPath.LogExePath);
|
|
|
+
|
|
|
ServiceResultEntity sre = new ServiceResultEntity();
|
|
|
sre.Data = new DataSet();
|
|
|
sre.Status = Constant.ServiceResultStatus.Success;
|
|
|
@@ -694,6 +700,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
string groutingBatchNoBegin = "";
|
|
|
try
|
|
|
{
|
|
|
+
|
|
|
conn.Connect();
|
|
|
JObject jsonL = JObject.Parse(groutingData);
|
|
|
|
|
|
@@ -883,6 +890,11 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
//按注浆次数循环 保存注浆记录
|
|
|
for (int i = 0; i < Convert.ToInt32(jsonL["GROUTINGTIMES"].ToString()); i++)
|
|
|
{
|
|
|
+ OutputLog.TraceLog(LogPriority.Information,
|
|
|
+ "",
|
|
|
+ System.Reflection.MethodBase.GetCurrentMethod().Name,
|
|
|
+ "【i值变化】" + i.ToString(),
|
|
|
+ LocalPath.LogExePath);
|
|
|
//获取注浆ID
|
|
|
int groutingDailyId = Convert.ToInt32(
|
|
|
conn.GetSqlResultToStr(@"SELECT SEQ_PM_GROUTINGDAILY_ID.NEXTVAL FROM DUAL"));
|
|
|
@@ -938,7 +950,11 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
//验证注浆原因,如果没给数据,置为空
|
|
|
if (!(jsonM[j]["NOGROUTINGRREASON"] is object))
|
|
|
jsonM[j]["NOGROUTINGRREASON"] = "null";
|
|
|
-
|
|
|
+ OutputLog.TraceLog(LogPriority.Information,
|
|
|
+ "",
|
|
|
+ System.Reflection.MethodBase.GetCurrentMethod().Name,
|
|
|
+ "【i值变化2】" + i.ToString(),
|
|
|
+ LocalPath.LogExePath);
|
|
|
//插入注浆记录明细
|
|
|
sqlStr += $@"
|
|
|
INSERT INTO TP_PM_GROUTINGDAILYDETAIL (
|
|
|
@@ -1033,7 +1049,11 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
sre.Result = groutingDailyId;
|
|
|
}
|
|
|
sqlStr += "END;";
|
|
|
-
|
|
|
+ OutputLog.TraceLog(LogPriority.Information,
|
|
|
+ "",
|
|
|
+ System.Reflection.MethodBase.GetCurrentMethod().Name,
|
|
|
+ "【sql文】" + sqlStr,
|
|
|
+ LocalPath.LogExePath);
|
|
|
result = conn.ExecuteNonQuery(sqlStr);
|
|
|
sre.Status = Constant.ServiceResultStatus.Success;
|
|
|
sre.Message = "操作成功!";
|
|
|
@@ -1050,7 +1070,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
|
|
|
}
|
|
|
}
|
|
|
//更新 成型线 最后注浆日期 注浆批次
|
|
|
- if(sre.Status==Constant.ServiceResultStatus.Success)
|
|
|
+ if (sre.Status == Constant.ServiceResultStatus.Success)
|
|
|
{
|
|
|
sqlStr = $@"
|
|
|
UPDATE
|