From a8f5f6d475e67cd3b50d3e284eb54b3eb665d971 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 11 六月 2024 21:11:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 108 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index ff159be..20f2515 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -327,6 +327,17 @@
oBill.DetailColl.Add(oItemSub);
}
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -339,7 +350,6 @@
}
else //缂栬緫淇濆瓨
{
- string s = "";
if (BillOld.ShowBill(lsmain[0].HInterID, ref s) == false)
{
objJsonResult.code = "0";
@@ -531,7 +541,16 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
@@ -568,11 +587,12 @@
}
//==================================================================================
-
//瀹℃牳鎻愪氦
oCN.BeginTran();
//澧炲姞鍏宠仈
oCN.RunProc("exec h_p_Kf_SellOutBill_Check " + HInterID + ",'" + oBill.BillType + "','" + CurUserName + "'");
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨
+ ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory '" + HInterID + "','" + oBill.BillType + "','1'", "h_KF_UPDateICinventory");
//鍐欏叆鏃ュ織
string WorkList = "瀹℃牳鍗曟嵁锛屽崟鎹彿锛�" + oBill.omodel.HBillNo;
string SystemName = "LMES-閿�鍞嚭搴撳崟妯″潡";
@@ -1168,5 +1188,90 @@
}
}
#endregion
+
+ #region 閿�鍞嚭搴撳崟 涓嬫煡
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <returns></returns>
+ [Route("Kf_SellOutBill/SellOutBill_LookDown")]
+ [HttpGet]
+ public object SellOutBill_LookDown(int HInterID)
+ {
+ try
+ {
+ List<object> columnNameListSum = new List<object>();
+ List<object> columnNameList0 = new List<object>();
+ //List<object> columnNameList1 = new List<object>();
+ //List<object> columnNameList2 = new List<object>();
+ //List<object> columnNameList3 = new List<object>();
+ //List<object> columnNameList4 = new List<object>();
+
+ string sql = "exec h_p_Kf_SellOutBill_lookdown " + HInterID;
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutBill_lookdown");
+
+ //娣诲姞 閿�鍞皟浠峰崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ ////娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
+ //foreach (DataColumn col in ds.Tables[1].Columns)
+ //{
+ // Type dataType = col.DataType;
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ // columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
+
+ ////娣诲姞 鐗规壒鐢宠鍗� 鍒楀悕
+ //foreach (DataColumn col in ds.Tables[2].Columns)
+ //{
+ // Type dataType = col.DataType;
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ // columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
+
+ ////娣诲姞 閿�鍞嚭搴撳崟 鍒楀悕
+ //foreach (DataColumn col in ds.Tables[3].Columns)
+ //{
+ // Type dataType = col.DataType;
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ // columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
+
+ ////娣诲姞 宸ュ簭娴佽浆鍗� 鍒楀悕
+ //foreach (DataColumn col in ds.Tables[4].Columns)
+ //{
+ // Type dataType = col.DataType;
+ // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ // columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ //}
+
+ columnNameListSum.Add(columnNameList0);
+ //columnNameListSum.Add(columnNameList1);
+ //columnNameListSum.Add(columnNameList2);
+ //columnNameListSum.Add(columnNameList3);
+ //columnNameListSum.Add(columnNameList4);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables;
+ objJsonResult.list = columnNameListSum;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1