From e6d75af42f08f22101c6307b7d9eaf482a37a6a8 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 21 一月 2022 17:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_ProcessReport.cs | 6 +++---
WebAPI/DLL/ClsSc_MESEndWorkBill.cs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
index af7f884..1943e50 100644
--- a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
@@ -458,7 +458,7 @@
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
oCn.BeginTran();
oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
- //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
+ //鏍规嵁寮�宸ュ崟鍐呯爜 鍙栧埌鐢熶骇鐘舵�佷复鏃惰〃涓诲唴鐮侊紝鐒跺悗鏇存柊鐢熶骇鐘舵�佷复鏃惰〃鐘舵�佷负锛氬緟鐢熶骇 浠诲姟鍗曠姸鎬�(0寰呯敓浜э紝1鐢熶骇涓紝2鎸傝捣锛�3宸插畬宸�)
oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='瀹屽伐'");
oCn.Commit();
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index 66150bf..f1c9bb5 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -179,11 +179,11 @@
") ");
}
//鏇存柊鍏宠仈鏁伴噺
- AddNewRelation(ref sReturn, omodel.HInterID);
+ //AddNewRelation(ref sReturn, omodel.HInterID);
//鏇存柊鍏宠仈鏁伴噺
- //oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
+ oCn.RunProc("exec h_p_Sc_UpDateICMOBillStepStatusRelation_Add " + omodel.HInterID);
//鍥炲～ 鐢熶骇鐘舵�佽〃 鏃ヨ鍒� 涓� 宸插畬宸� 鐘舵��
- oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
+ //oCn.RunProc("exec h_p_Sc_UpDateICMOBillQualityStatus " + omodel.HICMOStatusInterID.ToString() + ",3");
//榛樿鍙樹负 鐢宠妫�楠岀姸鎬�
oCn.RunProc("exec h_p_Sc_UpDateProcessReportStatus " + omodel.HInterID.ToString() + ",15");
//
--
Gitblit v1.9.1