From cdaf126a48444b9c055f44c7266a7d43343aeb1e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:39:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 253 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 240 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 9f1f8b7..11b96af 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using System.Text.RegularExpressions;
namespace WebAPI.Controllers
{
public class Gy_SupplierController : ApiController
@@ -110,6 +111,83 @@
}
}
+ #region 瀹㈡埛鏍规嵁鍒嗙被鑾峰彇鏈�澶у鎴风紪鐮�
+ [Route("Gy_Supplier/getMaxNum")]
+ [HttpGet]
+ public object getMaxNum(int HSupTypeID, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HSupTypeID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁閫夋嫨鍏蜂綋鍒嗙被锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(@"select * from h_v_Gy_SupplierList where 缁勭粐鍚嶇О='" + Organization + "'" + "and HSupTypeID = '" + HSupTypeID + "'" + " order by 渚涘簲鍟嗕唬鐮� desc", "h_v_Gy_SupplierList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ垎绫荤殑瀹㈡埛缂栫爜璇蜂娇鐢ㄦ櫘閫氭柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HNumber = ds.Tables[0].Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔壘鍒版暟瀛楅儴鍒� (?<=\D)鏄竴涓浂瀹芥柇瑷�锛岃〃绀哄墠闈㈢殑瀛楃涓嶆槸鏁板瓧 (\d+)$琛ㄧず鍚庨潰璺熺潃涓�杩炰覆瀛楃涓茬煡閬撴湯灏�
+ Match match = Regex.Match(HNumber, @"(?<=\D)(\d+)$");
+ if (match.Success)
+ {
+ string prefix = HNumber.Substring(0, HNumber.Length - match.Length); // 鎻愬彇鍓嶇紑
+ int number = int.Parse(match.Value); // 瑙ｆ瀽鏁板瓧
+ // 鏁板瓧+1
+ number++;
+ // 鏍煎紡鍖栨暟瀛楋紝淇濇寔鍘熼暱搴�
+ string formattedNumber = number.ToString().PadLeft(match.Length, '0');
+ // 閲嶆柊缁勫悎瀛楃涓�
+ string result = prefix + formattedNumber;
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "success";
+ objJsonResult.data = result;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "姝ゅ垎绫讳緵搴斿晢缂栫爜鏍煎紡鏈夎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
/// 渚涘簲鍟嗗垪琛ㄤ慨鏀规寜閽柟娉�
///鍙傛暟锛歴tring sql銆�
@@ -134,11 +212,14 @@
left join Gy_PoStockStyle f on s.HPSStyleID=f.HItemID
where s.HItemID='" + HInterID + "'");
ds = oCN.RunProcReturn(sql, "Gy_Supplier");
-
+ DataSet cs = oCN.RunProcReturn("select * from Gy_Supplier_PayPlan where HSupID = '"+ HInterID + "'", "Gy_Supplier_PayPlan");
+ List<Object> list = new List<object>();
+ list.Add(cs);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = list;
return objJsonResult;
}
catch (Exception e)
@@ -165,15 +246,16 @@
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ //涓昏〃鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
DAL.ClsGy_Supplier_Ctl oDept = new DAL.ClsGy_Supplier_Ctl();
DAL.ClsGy_Supplier_View oDeptHlp = new DAL.ClsGy_Supplier_View();
-
-
- List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);
+ List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
long HItemID = list[0].HInterID;
string HNumber = list[0].HNumber;
@@ -220,9 +302,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -242,6 +321,22 @@
"') ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //瀛愯〃娣诲姞
+ List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
+ int i = 0;
+ DataSet Cs;
+ Cs = oCN.RunProcReturn("select MAX(HItemID)HItemID from Gy_Supplier", "Gy_Supplier");
+ string MaxHItemID = Cs.Tables[0].Rows[0]["HItemID"].ToString();
+ //鍒犻櫎瀛愯〃鎿嶄綔 闃叉鍑洪敊
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + MaxHItemID + "'");
+ foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
+ {
+ i++;
+ oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
+ (HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
+ values({MaxHItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
+ }
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -319,6 +414,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
+
[Route("Gy_Supplier/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
@@ -333,9 +429,10 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
- string msg3 = sArray[1].ToString(); //鍒楄〃涓籌D
- string msg4 = sArray[2].ToString(); //鐧诲綍浜哄憳
- string msg5 = sArray[3].ToString(); //鏉冮檺妯″潡浠ｇ爜
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string msg4 = sArray[2].ToString(); //鍒楄〃涓籌D
+ string msg5 = sArray[3].ToString(); //鐧诲綍浜哄憳
+ string msg6 = sArray[4].ToString(); //鏉冮檺妯″潡浠ｇ爜
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
@@ -378,7 +475,7 @@
long HPSStyleID = list[0].HPSStyleID;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+ if (!ClsPub.Security_Log(msg6, 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -439,6 +536,22 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
+
+ //瀛愯〃娣诲姞
+ List<ClsGy_Supplier_PayPlan> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_Supplier_PayPlan>>(msg3);
+ int i = 0;
+ //鍒犻櫎瀛愯〃鎿嶄綔 闃叉鍑洪敊
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+ foreach (ClsGy_Supplier_PayPlan oSub in DetailColl)
+ {
+ i++;
+ oCN.RunProc($@"Insert into Gy_Supplier_PayPlan
+ (HSupID,HSubID,HPayType,HPayRate,HPayTime,HPayRemark)
+ values({HItemID},{i} ,'{oSub.HPayType}',{oSub.HPayRate},{oSub.HPayTime},'{oSub.HPayRemark}')");
+ }
+
+
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -499,9 +612,13 @@
objJsonResult.data = null;
return objJsonResult;
}
+ oCN.BeginTran();
//
if (oGroup.DeleteByID(HItemID))
{
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+ oCN.Commit();
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oGroupHlp.omodel.HNumber + ",鍚嶇О锛�" + oGroupHlp.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
@@ -513,6 +630,7 @@
}
else
{
+ oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触";
@@ -893,5 +1011,114 @@
}
#endregion
+ #region 鏍规嵁鐖秈d鍜岀瓑绾ц幏寰楁爲鐘跺浘閫掑綊
+
+ [Route("Gy_BadReason/Gy_SupTypeTreeListByLevel")]
+ [HttpGet]
+ public object Gy_MaterTypeTreeListByLevel()
+ {
+ try
+ {
+ string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel from Gy_SupType order by hnumber");
+
+ ds = oCN.RunProcReturn(sql1, "Gy_SupType");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "渚涘簲鍟嗗垎绫昏缃�";
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var HLevel = (int)row["hlevel"];
+ if (HLevel == 1)
+ {
+ TreeModel tree = new TreeModel();
+ tree.id = row["hitemid"].ToString();
+ tree.title = row["hname"].ToString();
+ treeModels[0].children.Add(tree);
+ }
+ }
+ getTreeByLevel(ds.Tables[0], treeModels[0].children, 2);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public void getTreeByLevel(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var HLevel = (int)dt.Rows[i]["hlevel"];
+ var HParentID = dt.Rows[i]["hparentid"].ToString();
+ if (HLevel == num && HParentID == tree[m].id)
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["hitemid"].ToString();
+ tbjson.title = dt.Rows[i]["hname"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ getTreeByLevel(dt, tree[m].children, num + 1);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
+
+ #region 鐗╂枡鍒嗙被 鏍戝舰鍥�(鏍规嵁浠ｇ爜灞曞紑鏍戠姸鍥�)
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+ /// <summary>
+ /// 閫掑綊鍑芥暟
+ /// </summary>
+ public void digui(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
+ if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["hitemid"].ToString();
+ tbjson.title = dt.Rows[i]["hname"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1