From b99276556da4de24bddaeb8452d466008da63bb5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 12 八月 2021 11:00:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 7ae97e2..552b21d 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -10,6 +10,8 @@
public Models.ClsSc_MESBeginWorkBillMain omodel = new Models.ClsSc_MESBeginWorkBillMain();
public List<Models.ClsSc_MESBeginWorkBillSub> DetailColl = new List<Models.ClsSc_MESBeginWorkBillSub>();
//public List<Model.ClsSc_MESBeginWorkBillSub_Item> DetailColl1 = new List<Model.ClsSc_MESBeginWorkBillSub_Item>();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public ClsSc_MESBeginWorkBill()
{
base.MvarItemKeySub = "Sc_MESBeginWorkBillSub";
@@ -53,7 +55,7 @@
//",HCheckDate='" + omodel.HCheckDate + "'" +
//",HMaker='" + omodel.HMaker + "'" +
//",HMakeDate='" + omodel.HMakeDate + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" +omodel.HMaker + "'" +
",HUpDateDate=getdate()" +
//",HCloseMan='" + omodel.HCloseMan + "'" +
//",HCloseDate='" + omodel.HCloseDate + "'" +
@@ -166,7 +168,7 @@
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + omodel.HMaker+ "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
@@ -178,6 +180,14 @@
//鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='寮�宸�'", "h_p_JIT_MESBeginWorkBill_BeginWork");
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string AutoCheck = oSystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck",ref sReturn);
+ if (AutoCheck=="Y")
+ {
+ //瀹℃牳鍗曟嵁
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2', HChecker='" + omodel.HMaker + "',HCheckDate=getdate() Where HInterID=" + omodel.HInterID.ToString());
+ }
+
oCn.Commit();
return true;
}
@@ -391,7 +401,7 @@
{
string HChecker = DBUtility.ClsPub.CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
//鐢熸垚璋冩嫧鍗�
//寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
//long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1