From c442255326f2ec746c5d9968de2769c565ace4da Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 01 六月 2022 08:48:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_MouldScrapOutBill.cs | 67 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MouldScrapOutBill.cs b/WebAPI/DLL/ClsSc_MouldScrapOutBill.cs
index 6886dbb..16f7691 100644
--- a/WebAPI/DLL/ClsSc_MouldScrapOutBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldScrapOutBill.cs
@@ -49,6 +49,7 @@
",HUpDateDate=getdate()" +
//========================================
",HSupID=" + omodel.HSupID.ToString() +
+ ",HSupTypeID=" + omodel.HSupTypeID.ToString() +
",HWHID=" + omodel.HWHID.ToString() +
//",HSCWHID=" + omodel.HSCWHID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
@@ -75,14 +76,14 @@
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
",HDesignLife,HLeaveLife" +
- ",HSCSPID,HSPGroupID,HBatchNo,HUseLife" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HUseLife,HStockOrgID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HUseLife.ToString() +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HUseLife.ToString() + "," + oSub.HStockOrgID.ToString() +
") ");
@@ -141,13 +142,13 @@
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HSupID,HWHID,HManagerID,HSCWHID,HEmpID,HSecManagerID" +
+ ",HSupTypeID,HSupID,HWHID,HManagerID,HSCWHID,HEmpID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
""+
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
- ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HSupTypeID.ToString() + ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
") ");
//鎻掑叆瀛愯〃
@@ -159,14 +160,14 @@
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
",HDesignLife,HLeaveLife" +
- ",HSCSPID,HSPGroupID,HBatchNo,HUseLife" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HUseLife,HStockOrgID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HUseLife.ToString() +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HUseLife.ToString()+","+ oSub.HStockOrgID.ToString() +
") ");
@@ -411,9 +412,57 @@
return null;
}
}
-
-
-
+
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCn.BeginTran();
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCn.Commit();
+ //鐢熸垚璋冩嫧鍗�
+ //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
+ //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
+ //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
+ //
+ sReturn = "瀹℃牳鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCn.BeginTran();
+ //杩樺師鍗曟嵁鐘舵�佷负鏈鏍哥姸鎬�
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔燂紒";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
}
}
--
Gitblit v1.9.1