BLL/bin/Release/BLL.dllBinary files differ
BLL/bin/Release/BLL.pdbBinary files differ
BLL/bin/Release/DAL.dllBinary files differ
BLL/bin/Release/DAL.pdbBinary files differ
BLL/bin/Release/DBUtility.dllBinary files differ
BLL/bin/Release/DBUtility.pdbBinary files differ
BLL/bin/Release/Model.dllBinary files differ
BLL/bin/Release/Model.pdbBinary files differ
BLL/bin/Release/Pub_Class.dllBinary files differ
BLL/bin/Release/Pub_Class.pdbBinary files differ
BLL/bin/Release/Pub_Control.dllBinary files differ
BLL/bin/Release/Pub_Control.pdbBinary files differ
BLL/bin/Release/SQLHelper.dllBinary files differ
BLL/bin/Release/SQLHelper.pdbBinary files differ
DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
DAL/bin/Release/DBUtility.dllBinary files differ
DAL/bin/Release/DBUtility.pdbBinary files differ
DAL/bin/Release/Model.dllBinary files differ
DAL/bin/Release/Model.pdbBinary files differ
DAL/bin/Release/Pub_Class.dllBinary files differ
DAL/bin/Release/Pub_Class.pdbBinary files differ
DAL/bin/Release/Pub_Control.dllBinary files differ
DAL/bin/Release/Pub_Control.pdbBinary files differ
DAL/bin/Release/SQLHelper.dllBinary files differ
DAL/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/bin/Release/DBUtility.dllBinary files differ
DBUtility/bin/Release/DBUtility.pdbBinary files differ
DBUtility/bin/Release/Pub_Class.dllBinary files differ
DBUtility/bin/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/Release/Pub_Control.dllBinary files differ
DBUtility/bin/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/Release/SQLHelper.dllBinary files differ
DBUtility/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_BillType.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.dllBinary files differ
DBUtility/obj/Release/DBUtility.pdbBinary files differ
Model/bin/Release/DBUtility.dllBinary files differ
Model/bin/Release/DBUtility.pdbBinary files differ
Model/bin/Release/Model.dllBinary files differ
Model/bin/Release/Model.pdbBinary files differ
Model/bin/Release/Pub_Class.dllBinary files differ
Model/bin/Release/Pub_Class.pdbBinary files differ
Model/bin/Release/Pub_Control.dllBinary files differ
Model/bin/Release/Pub_Control.pdbBinary files differ
Model/bin/Release/SQLHelper.dllBinary files differ
Model/bin/Release/SQLHelper.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.dllBinary files differ
Model/obj/Release/Model.pdbBinary files differ
Pub_Class/bin/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/Release/Pub_Control.pdbBinary files differ
SQLHelper/bin/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/Release/SQLHelper.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,4 +1,4 @@ <<<<<<< HEAD D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache @@ -6,7 +6,6 @@ D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache ======= <<<<<<< HEAD D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache @@ -20,7 +19,6 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache <<<<<<< HEAD ======= D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb @@ -32,7 +30,6 @@ C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb <<<<<<< HEAD ======= C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll @@ -41,7 +38,4 @@ D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb >>>>>>> 7857ee010972be30ae38d3d73c1516dd87d58d79 >>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89 >>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf >>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1 SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
New file @@ -0,0 +1 @@ 5dd9c82feb12f833c78ecebea7d9a46c99f29e3f SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,19 +1,15 @@ <<<<<<< HEAD D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache ======= <<<<<<< HEAD D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache ======= D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache @@ -25,5 +21,4 @@ D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb >>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89 >>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1 D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_CarTypeController.cs
New file @@ -0,0 +1,510 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers { public class Gy_CarTypeController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region 车å ä¿å [Route("Gy_CarTypeBill/ModifyByID")] [HttpPost] public object ModifyByID([FromBody] JObject oMain) { try { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string user = sArray[1].ToString(); //ååºåå msg2 = "[" + msg2.ToString() + "]"; List<Gy_CarType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_CarType>>(msg2); string HNumber = list[0].HNumber; string HName = list[0].HName; string HHelpCode = list[0].HHelpCode; int HStopflag = list[0].HStopflag ? 1 : 0; int HCREATEORGID = list[0].HCREATEORGID; int HUSEORGID = list[0].HUSEORGID; string HRemark = list[0].HRemark; long HItemID = list[0].HItemID; string HShortNumber = list[0].HShortNumber; long HParentID = list[0].HParentID; int HLevel = ClsPub.GetLevel(list[0].HNumber.Trim()); int HEndFlag = list[0].HEndFlag ? 1 : 0; string HUseFlag = list[0].HUseFlag; decimal HLong = list[0].HLong; decimal HWeight = list[0].HWeight; decimal HHeight = list[0].HHeight; decimal HMaxVolume = list[0].HMaxVolume; string Emp = user; string Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); #region [æéåéªè¯] // æéæ£æ¥ä»£ç ... #endregion //ä¿å if (HItemID == 0) { oCN.BeginTran(); string sql = "Insert into Gy_CarType" + "(HNumber,HName,HHelpCode,HStopflag,HCREATEORGID,HUSEORGID,HRemark,HShortNumber,HParentID,HEndFlag,HLevel,HMakeEmp,HMakeTime," + "HLong,HWeight,HHeight,HMaxVolume,HUseFlag)" + " values(" + "'" + HNumber + "','" + HName + "','" + HHelpCode + "'," + HStopflag + "," + HCREATEORGID + "," + HUSEORGID + ",'" + HRemark + "','" + HShortNumber + "'," + HParentID + "," + HEndFlag + "," + HLevel + ",'" + Emp + "','" + Time + "'," + HLong + "," + HWeight + "," + HHeight + "," + HMaxVolume + ",'" + HUseFlag + "')"; // æ·»å HUseFlag oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo); //æ°å¢åä¸çº§ä¸ºéæ«çº§ä»£ç oCN.RunProc("Update Gy_CarType set HEndFlag=0 where HItemID = " + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); } else //ç¼è¾ä¿å { oCN.BeginTran(); //å¤æè¯¥è®°å½æ´æ¹åï¼è¯¥è®°å½çä¸çº§è®°å½æ¯å¦ä¸ºæ«çº§ï¼å¹¶æ´æ¹æ«çº§æ è®° string sql = @"select * from Gy_CarType AS a where a.HParentID in (select b.HParentID from Gy_CarType AS b where b.HItemID = " + HItemID + ")"; ds = oCN.RunProcReturn(sql, "Gy_CarType"); if (ds != null && ds.Tables[0].Rows.Count == 1) { sql = "update Gy_CarType set HEndFlag = 1 where HItemID = " + ds.Tables[0].Rows[0]["HParentID"].ToString(); oCN.RunProc(sql); } if (HStopflag == 1) { //æ´æ°è®°å½ - æ·»å HUseFlag sql = "Update Gy_CarType set " + " HNumber = '" + HNumber + "', HName = '" + HName + "', HHelpCode = '" + HHelpCode + "', HStopflag = " + HStopflag + ", HCREATEORGID = " + HCREATEORGID + ", HUSEORGID = " + HUSEORGID + ", HRemark = '" + HRemark + "', HShortNumber = '" + HShortNumber + "', HParentID = " + HParentID + ", HEndFlag = " + HEndFlag + ", HLevel = " + HLevel + ", HUseFlag = '" + HUseFlag + "', HModifyEmp = '" + Emp + "', HModifyTime = '" + Time + "', HStopEmp = '" + Emp + "', HStopTime = '" + Time + "', HLong = " + HLong + ", HWeight = " + HWeight + ", HHeight = " + HHeight + ", HMaxVolume = " + HMaxVolume + " Where HItemID=" + HItemID; } else { //æ´æ°è®°å½ - æ·»å HUseFlag sql = "Update Gy_CarType set " + " HNumber = '" + HNumber + "', HName = '" + HName + "', HHelpCode = '" + HHelpCode + "', HStopflag = " + HStopflag + ", HCREATEORGID = " + HCREATEORGID + ", HUSEORGID = " + HUSEORGID + ", HRemark = '" + HRemark + "', HShortNumber = '" + HShortNumber + "', HParentID = " + HParentID + ", HEndFlag = " + HEndFlag + ", HLevel = " + HLevel + ", HUseFlag = '" + HUseFlag + "', HModifyEmp = '" + Emp + "', HModifyTime = '" + Time + "', HStopEmp = '" + "" + "', HStopTime = " + "null" + ", HLong = " + HLong + ", HWeight = " + HWeight + ", HHeight = " + HHeight + ", HMaxVolume = " + HMaxVolume + " Where HItemID=" + HItemID; } oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo); //ä¿®æ¹åï¼å°æ°ä¸çº§æ´æ°ä¸ºéæ«çº§ oCN.RunProc("Update Gy_CarType set HEndFlag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.Message; objJsonResult.data = null; return objJsonResult; } } #endregion #region 车å-æ¥è¯¢ [Route("Gy_CarType/list")] [HttpGet] public object getCarType(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Query" , 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.data = null; return objJsonResult; } if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_CarTypeList order by HItemID desc", "h_v_Gy_CarTypeList"); } else { string sql1 = "select * from h_v_Gy_CarTypeList where 1 = 1 "; string sql = sql1 + sWhere + " order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_CarTypeList"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 车å ç¼è¾-页é¢èµå¼ [Route("Gy_CarType/editInit")] [HttpGet] public object getCarTypeeditInit(string HInterID, string user) { try { //æ¥çæé if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Edit", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ç¼è¾æéï¼"; objJsonResult.data = null; return objJsonResult; } if (HInterID == null || HInterID.Equals("")) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "HInterIDä¸è½ä¸ºç©ºï¼"; objJsonResult.data = null; return objJsonResult; } string sql = "select * from Gy_CarType where HItemID = " + HInterID; ds = oCN.RunProcReturn(sql, "Gy_CarType"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æªæ¥è¯¢å°è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; } else if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "该车åå·²å®¡æ ¸ï¼ä¸å¯ç¼è¾ï¼"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 车å å é¤ [Route("Gy_CarType/delete")] [HttpGet] public object deleteCarType(string HInterID, string user) { try { // æ¥çæé if (!DBUtility.ClsPub.Security_Log("Gy_CarType_Drop", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ å 餿éï¼"; objJsonResult.data = null; return objJsonResult; } if (HInterID == null || HInterID.Equals("")) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "HInterIDä¸è½ä¸ºç©ºï¼"; objJsonResult.data = null; return objJsonResult; } //æ ¹æ®è®°å½ç¶æå¤ææ¯å¦å¯ä»¥å é¤ string sql = "select * from Gy_CarType where HItemID = " + HInterID; ds = oCN.RunProcReturn(sql, "Gy_CarType"); if (ds != null && ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "" && ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "该车åä¸å¯å é¤ï¼è¯·æ£æ¥è¯¥è½¦åçç¶æï¼"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran(); //å¤æè¯¥è®°å½å é¤åï¼è¯¥è®°å½çä¸çº§è®°å½æ¯å¦ä¸ºæ«çº§ï¼å¹¶æ´æ¹æ«çº§æ è®° sql = @"select * from Gy_CarType AS a where a.HParentID in (select b.HParentID from Gy_CarType AS b where b.HItemID = " + HInterID + ")"; ds = oCN.RunProcReturn(sql, "Gy_CarType"); if (ds != null && ds.Tables[0].Rows.Count == 1) { sql = "update Gy_CarType set HEndFlag = 1 where HItemID = " + ds.Tables[0].Rows[0]["HParentID"].ToString(); oCN.RunProc(sql); } //å é¤è¯¥è®°å½ oCN.RunProc("delete from Gy_CarType where HItemID = " + HInterID); oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; 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 #region 车å å®¡æ ¸/åå®¡æ ¸ [Route("Gy_CarType/AuditGy_CarType")] [HttpGet] public object AuditGy_CarType(int HInterID, int IsAudit, string CurUserName) { try { //å®¡æ ¸æé if (!DBUtility.ClsPub.Security_Log_second("Gy_CarType_Check", 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼æ æéï¼"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select * from Gy_CarType where HItemID=" + HInterID, "Gy_CarType"); if (ds.Tables[0].Rows.Count > 0) { if (IsAudit == 0) //å®¡æ ¸å¤æ { if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } } if (IsAudit == 1) //åå®¡æ ¸å¤æ { if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!"; objJsonResult.data = null; return objJsonResult; } } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ä¸åå¨!"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran(); if (IsAudit == 0) //å®¡æ ¸ { oCN.RunProc("update Gy_CarType set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å®¡æ ¸æå"; objJsonResult.data = null; } if (IsAudit == 1) //åå®¡æ ¸ { oCN.RunProc("update Gy_CarType set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "åå®¡æ ¸æå"; objJsonResult.data = null; } oCN.Commit(); return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥æè åå®¡æ ¸å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 车å ç¦ç¨ãåç¦ç¨ [Route("Gy_CarType/StopGy_CarType")] [HttpGet] public object StopGy_CarType(int HInterID, int IsStop, string CurUserName) { try { // ç¦ç¨æé if (!DBUtility.ClsPub.Security_Log_second("Gy_CarType_Stop", 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ç¦ç¨å¤±è´¥ï¼æ æéï¼"; objJsonResult.data = null; return objJsonResult; } var ds = oCN.RunProcReturn("select * from Gy_CarType where HItemID=" + HInterID, "Gy_CarType"); if (ds.Tables[0].Rows.Count > 0) { if (IsStop == 0) //ç¦ç¨å¤æ { if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ç¦ç¨!ä¸è½å次ç¦ç¨ï¼"; objJsonResult.data = null; return objJsonResult; } } if (IsStop == 1) //åç¦ç¨å¤æ { if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªç¦ç¨!ä¸éè¦åç¦ç¨!"; objJsonResult.data = null; return objJsonResult; } } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ä¸åå¨!"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran(); if (IsStop == 0) //ç¦ç¨ { oCN.RunProc("update Gy_CarType set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ç¦ç¨æå"; objJsonResult.data = null; } if (IsStop == 1) //åç¦ç¨ { oCN.RunProc("update Gy_CarType set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "åç¦ç¨æå"; objJsonResult.data = null; } oCN.Commit(); return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ç¦ç¨å¤±è´¥æè åç¦ç¨å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Models/»ù´¡×ÊÁÏ/Gy_CarType.cs
New file @@ -0,0 +1,38 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_CarType { public long HItemID { get; set; } // ä¸»é® public string HNumber { get; set; } // 代ç public string HName { get; set; } // åç§° public string HShortNumber { get; set; } // ç代ç public long HParentID { get; set; } // ç¶çº§ID public int HLevel { get; set; } // ç级 public bool HEndFlag { get; set; } // æ«çº§æ å¿ public bool HStopflag { get; set; } // ç¦ç¨æ å¿ public string HRemark { get; set; } // 夿³¨ public string HHelpCode { get; set; } // å©è®°ç public string HUseFlag { get; set; } // 使ç¨ç¶æï¼æªæ£æµï¼æªä½¿ç¨ï¼å·²ä½¿ç¨ï¼ public DateTime? HMakeTime { get; set; } // å»ºç«æ¶é´ public string HMakeEmp { get; set; } // å建人 public string HCheckEmp { get; set; } // å®¡æ ¸äºº public DateTime? HCheckTime { get; set; } // å®¡æ ¸æ¶é´ public string HModifyEmp { get; set; } // ä¿®æ¹äºº public DateTime? HModifyTime { get; set; } // ä¿®æ¹æ¶é´ public string HStopEmp { get; set; } // ç¦ç¨äºº public DateTime? HStopTime { get; set; } // ç¦ç¨æ¶é´ public int HUSEORGID { get; set; } // 使ç¨ç»ç» public int HCREATEORGID { get; set; } // å建ç»ç» // 车è¾å°ºå¯¸ç¸å ³å±æ§ public decimal HLong { get; set; } // é¿ï¼ç±³ï¼ public decimal HWeight { get; set; } // 宽ï¼ç±³ï¼ public decimal HHeight { get; set; } // é«ï¼ç±³ï¼ public decimal HMaxVolume { get; set; } // è½¦è¾æ¿è¿æå¤§ä½ç§¯(ç«æ¹ç±³) } } WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\gz\ç½ç«åå¸\MES-WEB-API</_PublishTargetUrl> <History>True|2025-11-26T00:17:26.0542037Z;False|2025-11-26T08:17:21.0094689+08:00;True|2025-11-25T16:08:56.9678959+08:00;True|2025-11-25T15:46:01.1567757+08:00;True|2025-11-25T15:40:57.2093513+08:00;True|2025-11-25T15:40:52.1981381+08:00;True|2025-11-25T15:40:10.9831365+08:00;True|2025-11-25T15:37:47.6041135+08:00;True|2025-11-25T14:56:39.2692143+08:00;True|2025-11-25T14:47:46.7382144+08:00;True|2025-11-25T14:37:56.4543437+08:00;True|2025-11-25T14:26:35.4950277+08:00;True|2025-11-25T14:19:46.8024652+08:00;True|2025-11-25T14:06:07.3386431+08:00;False|2025-11-25T14:05:55.0762072+08:00;True|2025-11-24T16:25:40.5924284+08:00;True|2025-11-24T16:25:36.2813598+08:00;True|2025-11-24T16:14:30.2878654+08:00;True|2025-11-24T16:03:25.8027841+08:00;True|2025-11-24T15:43:48.3169669+08:00;True|2025-11-24T15:06:43.4834120+08:00;False|2025-11-24T15:06:37.8868519+08:00;True|2025-11-21T10:52:06.9288486+08:00;False|2025-11-21T10:51:46.7867333+08:00;True|2025-11-12T10:53:06.6815915+08:00;</History> <History>False|2025-11-28T05:59:04.9171053Z;False|2025-11-28T13:58:54.8610002+08:00;False|2025-11-28T13:58:51.8059090+08:00;False|2025-11-28T13:58:48.9118327+08:00;True|2025-11-26T08:17:26.0542037+08:00;False|2025-11-26T08:17:21.0094689+08:00;True|2025-11-25T16:08:56.9678959+08:00;True|2025-11-25T15:46:01.1567757+08:00;True|2025-11-25T15:40:57.2093513+08:00;True|2025-11-25T15:40:52.1981381+08:00;True|2025-11-25T15:40:10.9831365+08:00;True|2025-11-25T15:37:47.6041135+08:00;True|2025-11-25T14:56:39.2692143+08:00;True|2025-11-25T14:47:46.7382144+08:00;True|2025-11-25T14:37:56.4543437+08:00;True|2025-11-25T14:26:35.4950277+08:00;True|2025-11-25T14:19:46.8024652+08:00;True|2025-11-25T14:06:07.3386431+08:00;False|2025-11-25T14:05:55.0762072+08:00;True|2025-11-24T16:25:40.5924284+08:00;True|2025-11-24T16:25:36.2813598+08:00;True|2025-11-24T16:14:30.2878654+08:00;True|2025-11-24T16:03:25.8027841+08:00;True|2025-11-24T15:43:48.3169669+08:00;True|2025-11-24T15:06:43.4834120+08:00;False|2025-11-24T15:06:37.8868519+08:00;True|2025-11-21T10:52:06.9288486+08:00;False|2025-11-21T10:51:46.7867333+08:00;True|2025-11-12T10:53:06.6815915+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml
New file @@ -0,0 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <DeleteExistingFiles>False</DeleteExistingFiles> <ExcludeApp_Data>False</ExcludeApp_Data> <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedPlatform>Any CPU</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> <PublishUrl>D:\gz\ç½ç«åå¸\MES-WEB-API</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> </PropertyGroup> </Project> WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
New file @@ -0,0 +1,501 @@ <?xml version="1.0" encoding="utf-8"?> <!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\gz\ç½ç«åå¸\MES-WEB-API</_PublishTargetUrl> <History>True|2025-12-01T03:30:09.3809914Z;True|2025-12-01T11:19:30.5598558+08:00;True|2025-12-01T11:15:45.0580785+08:00;True|2025-12-01T11:15:36.3372463+08:00;True|2025-12-01T08:41:58.9342211+08:00;True|2025-12-01T08:34:40.5643002+08:00;False|2025-12-01T08:34:34.1712047+08:00;True|2025-11-28T16:56:46.9372466+08:00;False|2025-11-28T16:54:57.8126796+08:00;False|2025-11-28T16:54:34.3567917+08:00;False|2025-11-28T16:54:22.5875981+08:00;False|2025-11-28T16:54:18.8357708+08:00;True|2025-11-28T16:09:19.7706533+08:00;True|2025-11-28T15:27:38.7722530+08:00;True|2025-11-28T15:16:20.5824019+08:00;True|2025-11-28T15:01:37.0768917+08:00;True|2025-11-28T14:09:57.0103401+08:00;True|2025-11-28T14:00:30.4339573+08:00;True|2025-11-28T14:00:24.1489586+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="bin/AlibabaCloud.EndpointUtil.dll"> <publishTime>04/07/2020 16:33:48</publishTime> </File> <File Include="bin/AlibabaCloud.GatewayDingTalk.dll"> <publishTime>04/25/2023 17:49:04</publishTime> </File> <File Include="bin/AlibabaCloud.GatewaySpi.dll"> <publishTime>07/31/2024 20:50:30</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiClient.dll"> <publishTime>08/06/2024 18:07:52</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiUtil.dll"> <publishTime>11/22/2022 11:24:18</publishTime> </File> <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll"> <publishTime>08/08/2024 19:43:22</publishTime> </File> <File Include="bin/AlibabaCloud.TeaUtil.dll"> <publishTime>07/15/2024 20:25:56</publishTime> </File> <File Include="bin/AlibabaCloud.TeaXML.dll"> <publishTime>08/03/2022 21:46:08</publishTime> </File> <File Include="bin/Aliyun.Credentials.dll"> <publishTime>07/24/2024 10:36:58</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>12/01/2025 11:29:56</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>12/01/2025 11:29:56</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>12/01/2025 11:29:55</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>12/01/2025 11:29:55</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> </File> <File Include="bin/Grpc.Core.Api.pdb"> <publishTime>03/19/2022 07:39:42</publishTime> </File> <File Include="bin/Grpc.Core.dll"> <publishTime>03/22/2022 13:17:20</publishTime> </File> <File Include="bin/Grpc.Core.pdb"> <publishTime>03/19/2022 07:39:48</publishTime> </File> <File Include="bin/grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/grpc_csharp_ext.x86.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.dll"> <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.pdb"> <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.so"> <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/19/2015 01:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>03/08/2023 15:09:56</publishTime> </File> <File Include="bin/NPOI.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OOXML.dll"> <publishTime>10/23/2021 09:07:56</publishTime> </File> <File Include="bin/NPOI.OOXML.pdb"> <publishTime>10/23/2021 17:07:56</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>12/01/2025 11:29:51</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>12/01/2025 11:29:51</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>12/01/2025 11:29:52</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>12/01/2025 11:29:52</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>12/01/2025 11:29:52</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>12/01/2025 11:29:52</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>12/01/2025 11:29:51</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>12/01/2025 11:29:51</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Configuration.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.DataSetExtensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Drawing.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.EnterpriseServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> <publishTime>08/19/2014 18:03:34</publishTime> </File> <File Include="bin/System.Memory.dll"> <publishTime>04/18/2019 00:24:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Extensions.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Net.Http.Primitives.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll"> <publishTime>09/19/2018 03:38:10</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.ApplicationServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> <publishTime>11/28/2018 20:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.DynamicData.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Entity.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Extensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> <publishTime>11/28/2018 21:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 12:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> <publishTime>02/11/2014 23:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> <publishTime>01/28/2015 12:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Xml.Linq.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Tea.dll"> <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>12/01/2025 11:29:53</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>12/01/2025 11:30:00</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>12/01/2025 11:30:00</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>12/01/2025 11:30:03</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> <publishTime>11/29/2018 21:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Config/kdapi.config"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Content/Site.css"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="Global.asax"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="grpc_csharp_ext.x86.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.so"> <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="libman.json"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="packages.config"> <publishTime>11/12/2025 10:43:48</publishTime> </File> <File Include="Template/barCodeTemplateStorage.json"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/web.config"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>11/12/2025 10:43:47</publishTime> </File> <File Include="Web.config"> <publishTime>12/01/2025 11:30:08</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj
@@ -625,6 +625,7 @@ <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CardStatusController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CardAddressController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CardTypeController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CarTypeController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_COMMONCONTACTBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CustLocationController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_DiscountListController.cs" /> @@ -968,6 +969,7 @@ <Compile Include="Models\åºç¡èµæ\Gy_Duty.cs" /> <Compile Include="Models\åºç¡èµæ\Gy_TemporaryArea.cs" /> <Compile Include="Models\åºç¡èµæ\Gy_StockPlace.cs" /> <Compile Include="Models\åºç¡èµæ\Gy_CarType.cs" /> <Compile Include="Models\åºç¡èµæ\WorkDay.cs" /> <Compile Include="Models\åºç¡èµæ\PackType.cs" /> <Compile Include="Models\åºç¡èµæ\WorkStation.cs" /> WebAPI/WebAPI.csproj.user
@@ -3,14 +3,13 @@ <PropertyGroup> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile16.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile17.pubxml</NameOfLastUsedPublishProfile> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> sdk_dingding/TopSdk/bin/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,4 +1,4 @@ <<<<<<< HEAD D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache @@ -6,7 +6,7 @@ D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache ======= <<<<<<< HEAD D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache @@ -32,7 +32,7 @@ C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache <<<<<<< HEAD D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache @@ -40,6 +40,3 @@ D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache ======= >>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89 >>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf >>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,23 +1,18 @@ <<<<<<< HEAD D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache ======= <<<<<<< HEAD D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache ======= D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb >>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89 >>>>>>> 859d5fb0665d48215793ecd8b07b114a3e66b7f1 D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ