From 2bee82c2ae0ac09a7ba324cd75ac46def5c1fde1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 02 四月 2025 13:54:56 +0800
Subject: [PATCH] 工艺路线：保存时，增加如果客户是 宝工，则不需要添加额外的 数据校验
---
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 252 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 248 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index dce832e..b7a2c38 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -2,11 +2,14 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
@@ -316,6 +319,7 @@
string HName = list[0].HName;
string HHelpCode = list[0].HHelpCode;
bool HStopflag = list[0].HStopFlag;
+ bool HStockCtrlFlag = list[0].HStockCtrlFlag;
string HRemark = list[0].HRemark;
string HBarCode = list[0].HBarCode;
long HEmpID = list[0].HEmpID;
@@ -325,6 +329,7 @@
//long HCREATEORGID = list[0].HCREATEORGID;
string HUpDater = list[0].HUpDater;
long HSPFlag = list[0].HSPFlag;
+ string HWarehouseType = list[0].HWarehouseType;
//寰楀埌鐭唬鐮�
string HShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);
if (HShortNumber.Trim() == "")
@@ -388,9 +393,11 @@
oCN.BeginTran();
oCN.RunProc("Insert into Gy_Warehouse " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HSPFlag,HCREATEORGID,HMaker,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HSPFlag,HCREATEORGID,HMaker,HMakeTime,HStockCtrlFlag" +
+ ",HWarehouseType) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + HEndFlag + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "',"+ HSPFlag + ","+ HUSEORGID + ",'"+msg3+"',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel.ToString() + "," + HEndFlag + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "',"+ HSPFlag + ","+ HUSEORGID + ",'"+msg3+"',getdate(),"+ Convert.ToString(HStockCtrlFlag ? 1 : 0)+"" +
+ ",'"+ HWarehouseType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//鍚敤浠撲綅
@@ -418,11 +425,13 @@
",HAddress='" + HAddress + "'" +
",HPhone='" + HPhone + "'" +
",HUSEORGID='" + HUSEORGID + "'" +
+ ",HWarehouseType='" + HWarehouseType + "'" +
",HCREATEORGID='" + HUSEORGID + "'" +
",HSPFlag='" + HSPFlag + "'" +
//",HSPGroupID='" + HSPGroupID + "'" +
",HUpdater='" + HUpDater + "'" +
",HUpdateDate= getdate()" +
+ ",HStockCtrlFlag=" + Convert.ToString(HStockCtrlFlag ? 1 : 0) +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -779,8 +788,6 @@
}
#endregion
-
-
#region 鐗╂枡鍒嗙被瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
@@ -971,5 +978,242 @@
}
#endregion
+ #region 妫�楠屼緷鎹垪琛� 鏂囦欢涓婁紶
+ //[Route("Gy_Warehouse/Gy_Process_Excel")]
+ //[HttpPost]
+ //public json Gy_InspectBasis_Excel()
+ //{
+ // json res = new json();
+ // try
+ // {
+ // //鑾峰彇鏂囦欢鍚嶇О
+ // var file = HttpContext.Current.Request.Files[0];
+ // //鑾峰彇鏂囦欢鐗╃悊璺緞
+ // string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ // //淇濆瓨鏂囦欢
+ // file.SaveAs(ExcelPath);
+
+ // NpoiHelper np = new NpoiHelper();
+ // DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ // //鍒犻櫎鏂囦欢
+ // File.Delete(ExcelPath);
+
+ // //鍒涘缓涓存椂琛�
+ // DataTable provisional = new DataTable("dt2");
+
+ // //娣诲姞鍒楀悕
+ // for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ // {
+ // provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ // }
+
+ // //娣诲姞鏁版嵁
+ // for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ // {
+ // DataRow row = provisional.NewRow();
+ // for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ // {
+ // row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ // }
+ // provisional.Rows.Add(row);
+ // }
+
+ // //鍒ゆ柇鍒�
+ // string error = JudgmentColumns(provisional);
+ // if (error.Length > 0)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ // res.data = null;
+ // return res;
+ // }
+
+ // for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ // {
+ // string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠撳簱浠ｇ爜"].ToString());
+ // string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠撳簱鍚嶇О"].ToString());
+ // string phone = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鑱旂郴鐢佃瘽"].ToString());
+ // string HEmpNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鑱屽憳浠ｇ爜"].ToString());
+ // string HEmpName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鑱屽憳鍚嶇О"].ToString());
+ // string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ // string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ // if(JudgeEmp(HEmpNumber, HEmpName))
+ // {
+ // res.code = CodeConstant.FAIL;
+ // res.count = CountConstant.FAIL;
+ // res.Message = "褰撳墠鑱屽憳涓嶅瓨鍦�";
+ // res.data = null;
+ // return res;
+ // }
+ // //鑾峰彇鐪熷疄琛屾暟
+ // int line = i + 1;
+ // }
+
+ // res.code = "1";
+ // res.count = 1;
+ // res.Message = error;
+ // res.data = provisional;
+ // return res;
+ // }
+ // catch (Exception e)
+ // {
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = "Exception锛�" + e.ToString();
+ // res.data = null;
+ // return res;
+ // }
+ //}
+
+ ///// <summary>
+ ///// 鍒ゆ柇褰撳墠鑱屽憳鏄惁瀛樺湪
+ ///// </summary>
+ ///// <param name="HEmpNumber"></param>
+ ///// <param name="HEmpName"></param>
+ ///// <returns></returns>
+ //private bool JudgeEmp(string HEmpNumber, string HEmpName)
+ //{
+ // if (!String.IsNullOrEmpty(HEmpNumber) && !String.IsNullOrEmpty(HEmpName))
+ // {
+ // DataSet emp = oCN.RunProcReturn("select * from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+ // return emp.Tables[0].Rows.Count <= EmptyConstant.EMPTY ? true : false;
+ // }
+ // return false;
+ //}
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("浠撳簱浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪粨搴撲唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("浠撳簱鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愪粨搴撳悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屼緷鎹垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_Warehouse/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_InspectBasis_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["浠撳簱浠ｇ爜"].ToString();
+ string HName = item["浠撳簱鍚嶇О"].ToString();
+ string phone = item["鑱旂郴鐢佃瘽"].ToString();
+ string HEmpNumber = item["鑱屽憳浠ｇ爜"].ToString();
+ string HEmpName = item["鑱屽憳鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"].ToString();
+ string HRemark = item["澶囨敞"].ToString();
+ int HEmpID = 0;
+ if (!String.IsNullOrEmpty(HEmpName) && !String.IsNullOrEmpty(HEmpNumber))
+ {
+ DataSet emp = oCN.RunProcReturn("select HItemID from Gy_Employee where HNumber = '" + HEmpNumber + "' and HName = '" + HEmpName + "'", "Gy_Employee");
+ HEmpID = (int)emp.Tables[0].Rows[0]["HItemID"];
+ }
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Warehouse where HNumber='" + HNumber + "'", "Gy_InspectInstruMent");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_Warehouse (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HEmpID, HPhone)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{HEmpID}', '{phone}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_Warehouse set HName ='" + HName + "' , HHelpCode = '" + HHelpCode + " ', HPhone= '" + phone + "', HEmpID = '" + HEmpID + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1