From abe6630fe280b96b246170adcd6a2f666c77c520 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 21 一月 2021 13:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Service/YqnQbService.cs | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 61b1fc7..9ec208b 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -91,26 +91,13 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
string sErrMsg = string.Empty;
- oMain.HYear = 2021;
- oMain.HPeriod = 1;
var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);
if (!result)
{
+
return new ApiResult { code = -1, msg = sErrMsg };
}
return new ApiResult { code = 1, msg = "鎿嶄綔鎴愬姛" };
- }
- /// <summary>
- /// 鍑虹珯鎺ユ敹鍗�
- /// </summary>
- public static ApiResult SetStationOutBill(StationOutBillView omodel)
- {
- WebS.WebService1 oWebs = new WebS.WebService1();
- omodel.HYear = 2021;
- omodel.HPeriod = 1;
- string sErrMsg = string.Empty;
- var result = SetOutBill(omodel);
- return result;
}
/// <summary>
/// 鑾峰彇杩涚珯鍗曞垪琛�
@@ -136,6 +123,16 @@
return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
+ /// <summary>
+ /// 鍑虹珯鎺ユ敹鍗�
+ /// </summary>
+ public static ApiResult SetStationOutBill(StationOutBillView omodel)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ string sErrMsg = string.Empty;
+ var result = SetOutBill(omodel);
+ return result;
+ }
#region sql璇彞
public static DataSet GetStationOutBill(string strWhere)
{
@@ -148,7 +145,7 @@
{
var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet= oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
return dataSet;
}
public static DataSet GetBarCodeDb(string billBarCode)
@@ -166,7 +163,7 @@
public static DataSet GetGroupDb(string sWhere)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇鐝粍浠ｇ爜,HName 鐢熶骇鐝粍 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
return dataSet;
}
@@ -195,7 +192,7 @@
if (!dicLock.TryAdd(omodel.HBillNo, omodel.HBillNo))
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID("4788", ref DBUtility.ClsPub.sExeReturnInfo);
oCN.BeginTran();
var sql = "Insert Into Sc_StationOutBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
@@ -205,7 +202,7 @@
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
",HSupID,HQty,HPrice,HMoney" +
") " +
- " values('3791','3791'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('4788','4788'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HICMOInterID.ToString() + ",'" + 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() +
@@ -225,6 +222,41 @@
dicLock.TryRemove(omodel.HBillNo, out string key);
}
}
+ public static ApiResult SetInBill(ClsSc_StationInBillMain omodel)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID("3790", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_StationInBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ ",HSupID,HQty,HPrice,HMoney,HMaker" +
+ ") " +
+ " values('3790','3790'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
+ "," + omodel.HICMOInterID.ToString() + ",'" + 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() +
+ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
+ "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +
+ ",'"+omodel.HMaker+"') ");
+
+ oCN.Commit();
+ return new ApiResult { code = 1, msg = "鏂板鎴愬姛" };
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ return new ApiResult { code = -1, msg = "淇濆瓨閿欒/" + e.ToString() };
+ }
+ }
#endregion
}
--
Gitblit v1.9.1