From 20879fb51927c6a192fe50b6fe5ab19600d83641 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期四, 24 十月 2024 20:04:10 +0800 Subject: [PATCH] 1 --- sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 6 DAL/工资管理/ClsPay_WorkTimesBill.cs | 8 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 71 ++++++ WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44 ++-- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 71 ++++++ sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 WebAPI/Controllers/LMESController.cs | 15 + Model/工资管理/ClsPay_WorkTimesBillSub.cs | 1 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 120 +++++----- WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs | 181 ++++++++++++++++ /dev/null | 0 WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 4 WebAPI/Web.config | 6 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs | 59 +++++ WebAPI/WebAPI.csproj | 1 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs | 60 +++++ 19 files changed, 544 insertions(+), 103 deletions(-) diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs" index 4f536c7..4dc7a81 100644 --- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs" +++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs" @@ -129,7 +129,7 @@ ",HOverTimes,HOverDays,HLeaveTimes,HLeaveDays,HLateQty,HLateTimes" + ",HEarlyQty,HEarlyTimes,HOutForEmpQty,HOutForEmpTimes,HOutForComQty,HOutForComTimes" + ",HAbsentDays,HRestFlag,HSchClassID,HNeedTimes,HCTPrjID,HWorkTypeID" + - ",HPayMoney,HMoney" + + ",HPayMoney,HMoney,HBaseTimes_Sec" + ") values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" + @@ -137,7 +137,7 @@ "," + oSub.HOverTimes.ToString() + "," + oSub.HOverDays.ToString() + "," + oSub.HLeaveTimes.ToString() + "," + oSub.HLeaveDays.ToString() + "," + oSub.HLateQty.ToString() + "," + oSub.HLateTimes.ToString() + "," + oSub.HEarlyQty.ToString() + "," + oSub.HEarlyTimes.ToString() + "," + oSub.HOutForEmpQty.ToString() + "," + oSub.HOutForEmpTimes.ToString() + "," + oSub.HOutForComQty.ToString() + "," + oSub.HOutForComTimes.ToString() + "," + oSub.HAbsentDays.ToString() + "," + Convert.ToString(oSub.HRestFlag ? 1 : 0) + "," + oSub.HSchClassID.ToString() + "," + oSub.HNeedTimes.ToString() + "," + oSub.HCTPrjID.ToString() + "," + oSub.HWorkTypeID.ToString() + - "," + oSub.HPayMoney.ToString() + "," + oSub.HMoney.ToString() + + "," + oSub.HPayMoney.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HBaseTimes_Sec.ToString() + ") "); } //淇濆瓨鍚庢帶鍒� @@ -222,7 +222,7 @@ ",HOverTimes,HOverDays,HLeaveTimes,HLeaveDays,HLateQty,HLateTimes" + ",HEarlyQty,HEarlyTimes,HOutForEmpQty,HOutForEmpTimes,HOutForComQty,HOutForComTimes" + ",HAbsentDays,HRestFlag,HSchClassID,HNeedTimes,HCTPrjID,HWorkTypeID" + - ",HPayMoney,HMoney" + + ",HPayMoney,HMoney,HBaseTimes_Sec" + ") values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'"+ @@ -230,7 +230,7 @@ "," + oSub.HOverTimes.ToString() + "," + oSub.HOverDays.ToString() + "," + oSub.HLeaveTimes.ToString() + "," + oSub.HLeaveDays.ToString() + "," + oSub.HLateQty.ToString() + "," + oSub.HLateTimes.ToString() + "," + oSub.HEarlyQty.ToString() + "," + oSub.HEarlyTimes.ToString() + "," + oSub.HOutForEmpQty.ToString() + "," + oSub.HOutForEmpTimes.ToString() + "," + oSub.HOutForComQty.ToString() + "," + oSub.HOutForComTimes.ToString() + "," + oSub.HAbsentDays.ToString() + "," + Convert.ToString(oSub.HRestFlag ? 1 : 0) + "," + oSub.HSchClassID.ToString() + "," + oSub.HNeedTimes.ToString() + "," + oSub.HCTPrjID.ToString() + "," + oSub.HWorkTypeID.ToString() + - "," + oSub.HPayMoney.ToString() + "," + oSub.HMoney.ToString() + + "," + oSub.HPayMoney.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HBaseTimes_Sec.ToString() + ") "); } //淇濆瓨鍚庢帶鍒� diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs" index 23c819a..25828d0 100644 --- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs" +++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBillSub.cs" @@ -11,6 +11,7 @@ public Single HPMTimes;// money '下午工时 public Single HAMTimes;// money '上午工时 public Single HBaseTimes;// money '基本工时 + public Single HBaseTimes_Sec;// money '计时工时 public Single HBaseDays;// money '基本天数 public Single HOverTimes;// money '加班工时 public Single HOverDays;// money '加班天数 diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index 5ee8340..8de43db 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -10,9 +10,3 @@ C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache -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.AssemblyReference.cache -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs deleted file mode 100644 index e5dc9b8..0000000 --- a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// <autogenerated /> -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache deleted file mode 100644 index f5e894a..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache +++ /dev/null Binary files differ diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache deleted file mode 100644 index bfb772c..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -5dd9c82feb12f833c78ecebea7d9a46c99f29e3f diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt deleted file mode 100644 index 243e34e..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,6 +0,0 @@ -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll deleted file mode 100644 index 9a5be6e..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.dll +++ /dev/null Binary files differ diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb deleted file mode 100644 index 310ad83..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb +++ /dev/null Binary files differ diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index fb8c02e..ab0d7f8 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -444,6 +444,7 @@ ",HSourceID4=" + HSourceID4 + ",HSourceID5=" + HSourceID5 + ",HPayProcID=" + HPayProcID + + ",HGroupID=" + HGroupID + ",HWorkTimes=" + HWorkTimes + ",HSaveBillFlag=0 " + ",HBadCount=" + HBadCount + @@ -3831,6 +3832,76 @@ } #endregion + #region 淇濆瓨鐢熸垚鐧芥爣 + public class WhiteLabelGeneration { + public string ProjectNo { get; set; } + public string OrderingCode { get; set; } + public string DrawVersionNumber { get; set; } + public string CustomerOrderNumber { get; set; } + public string WaybillNumber { get; set; } + public string HRemark { get; set; } + public string HBarCode_Pack { get; set; } + public string HBillType { get; set; } + } + [Route("Cj_StationOutBill_Detail/MES_WhiteLabelGeneration")] + [HttpPost] + public object MES_WhiteLabelGeneration([FromBody] JObject oMain) + { + try + { + oCN.BeginTran(); + + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁 + WhiteLabelGeneration Main = Newtonsoft.Json.JsonConvert.DeserializeObject<WhiteLabelGeneration>(msg2); + + string HBillType = Main.HBillType; + string ProjectNo = Main.ProjectNo; + string OrderingCode = Main.OrderingCode; + string DrawVersionNumber = Main.DrawVersionNumber; + string CustomerOrderNumber = Main.CustomerOrderNumber; + string WaybillNumber = Main.WaybillNumber; + string HRemark = Main.HRemark; + string HBarCode_Pack = Main.HBarCode_Pack; + + ds = oCN.RunProcReturn($"exec h_p_MES_HBarCode_White_SMR_15 '{HBillType}','{ProjectNo}','{OrderingCode}','{DrawVersionNumber}','{CustomerOrderNumber}','{WaybillNumber}','{HRemark}','{HBarCode_Pack}'", "h_p_MES_HBarCode_White_SMR_15"); + + string HBarCode_White = ds.Tables[0].Rows[0]["HBarCode_White"].ToString(); + + if (HBarCode_White == "") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鐢熸垚鐧芥爣澶辫触,鍗曟嵁鏍囪瘑:" + HBarCode_Pack + "锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.RunProc("update Sc_PackUnionBillMain set HBarCode_White='" + HBarCode_White + "' where HBarCode_Pack='" + HBarCode_Pack + "'"); + + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + #region 涓嬫帹璐ㄩ噺姹囨姤鍗曟椂杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曚俊鎭� [Route("Cj_StationOutBill/PushDownBackInfo")] [HttpGet] diff --git a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs index f32471c..e1d9db7 100644 --- a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs +++ b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs @@ -14,9 +14,70 @@ public class Sc_KeyElementBindingController : ApiController { Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + public DAL.ClsSc_AssemblyBill BillOld = new DAL.ClsSc_AssemblyBill(); private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; + + #region 鍏抽敭浠剁粦瀹氬垪琛� 鏌ヨ + /// <summary> + /// 杩斿洖鍏抽敭浠剁粦瀹氬垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Sc_KeyElementBinding/list")] + [HttpGet] + public object list(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Sc_AssemblyBill_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_Sc_AssemblyBillList order by 鍗曟嵁鍙� desc", "h_v_Sc_AssemblyBillList"); + } + else + { + string sql1 = "select * from h_v_Sc_AssemblyBillList where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc"; + ds = oCN.RunProcReturn(sql, "h_v_Sc_AssemblyBillList"); + } + + //娣诲姞鍒楀悕 + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + 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 宸ュ簭娴佽浆鍗$淮鎶�-鏌ヨ /// <summary> @@ -373,5 +434,125 @@ } } #endregion + + #region 鍏抽敭浠剁粦瀹� 鍒犻櫎 + [Route("Sc_KeyElementBinding/Del")] + [HttpGet] + public object Del(string HInterID, string user) + { + try + { + string s = ""; + + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Sc_AssemblyBill_Delete", 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; + } + + if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹湁璇紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //鍒ゆ柇鏄惁鍙紪杈� + if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + + //鍒犻櫎鍓嶆帶鍒�========================================= + //string sql1 = "exec h_p_Sc_QualityReportBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + //ds = oCN.RunProcReturn(sql1, "h_p_Sc_QualityReportBill_BeforeDelCtrl"); + //if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + //if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + // objJsonResult.data = null; + // return objJsonResult; + //} + //================================================================================== + + oCN.BeginTran(); + + oCN.RunProc("delete from Sc_AssemblyBillMain where HInterID = " + HInterID); + oCN.RunProc("delete from Sc_AssemblyBillSub where HInterID='" + HInterID + "'"); + + //鍒犻櫎鍚庢帶鍒�================================================================================== + //string sql2 = "exec h_p_Sc_QualityReportBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + //ds = oCN.RunProcReturn(sql2, "h_p_Sc_QualityReportBill_AfterDelCtrl"); + //if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + //{ + // s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s; + // objJsonResult.data = null; + // oCN.RollBack(); + // return objJsonResult; + //} + //if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + //{ + // s = ds.Tables[0].Rows[0]["HRemark"].ToString(); + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s; + // objJsonResult.data = null; + // oCN.RollBack(); + // return objJsonResult; + //} + //============================================================================================== + + + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫叧閿欢缁戝畾淇℃伅锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } } diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs index 2d3d0fb..864e60e 100644 --- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs +++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs @@ -286,11 +286,11 @@ DataSet dss; dss = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Gy_RoutingBillMain"); //鍒ゆ柇鏄惁鍙紪杈� - if (dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) + if ((dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) || dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "1") { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�"; + objJsonResult.Message = "姝ゅ崟鎹姸鎬佹湭鍦ㄥ垱寤猴紝涓嶅厑璁镐慨鏀癸紒"; objJsonResult.data = 1; return objJsonResult; } @@ -1270,9 +1270,18 @@ { oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID); - //鍒锋柊榛樿宸ヨ壓璺嚎 - //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); - + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛 + if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 + { + //鍒锋柊榛樿宸ヨ壓璺嚎 + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); + } + } + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "瀹℃牳鎴愬姛"; @@ -2259,5 +2268,57 @@ } #endregion + #region 寰呭け鏁堟姤琛� + /// <summary> + /// 寰呭け鏁堟姤琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_RoutingBill/getInvalidityReport")] + [HttpGet] + public object getInvalidityReport(string sWhere, string user) + { + DataSet ds; + try + { + List<object> columnNameList = new List<object>(); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寰呭け鏁堟姤琛ㄦ棤鏉冮檺鏌ヨ!"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 澶辨晥鏃堕棿 BETWEEN NOW() - INTERVAL 15 DAY AND NOW() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList"); + 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));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + #endregion } } \ No newline at end of file diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index fb15989..d37daa8 100644 --- a/WebAPI/Controllers/LMESController.cs +++ b/WebAPI/Controllers/LMESController.cs @@ -3611,9 +3611,18 @@ //瀹℃牳宸ヨ壓璺嚎 oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString()); - - ////鍒锋柊榛樿宸ヨ壓璺嚎 - //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); + + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛 + if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 + { + //鍒锋柊榛樿宸ヨ壓璺嚎 + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); + } + } ////瀹℃牳鍗曟嵁 //if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo)) diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" index 6d87834..a258212 100644 --- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" +++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" @@ -1591,6 +1591,10 @@ { sqlName = "AIS20210820164804"; } + else if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") + { + sqlName = "AIS20240809105013"; + } else { sqlName = "AIS20210811135644"; diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" index 3b0dc25..837b3c5 100644 --- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" +++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" @@ -424,6 +424,66 @@ } #endregion + #region 宸ヨ祫缁撶畻鍗�(闆嗕綋) 鎵归噺瀹℃牳 + /// <summary> + /// 瀹℃牳/鍙嶅鏍稿伐璧勭粨绠楀崟(闆嗕綋) + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param> + /// <param name="HMaker">瀹℃牳浜�</param> + /// <returns></returns> + [Route("Pay_GroupBalBillController/CheckAll")] + [HttpGet] + public object CheckAll(string ids, int Type, string HMaker) + { + try + { + //澶勭悊瀛楃涓� + if (!string.IsNullOrEmpty(ids)) + { + long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse); + // 澶勭悊idArray... + oCn.BeginTran(); + for (int i = 0; i < idArray.Length; i++) + { + objJsonResult = (json)GetPay_GroupBalBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц + if (objJsonResult.count == 0) + { + oCn.RollBack(); + objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�"; + return objJsonResult; + } + } + oCn.Commit(); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇烽�夋嫨姝g‘琛�"; + objJsonResult.data = null; + return objJsonResult; + } + + objJsonResult.code = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "鎵ц鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ祫缁撶畻鍗�(涓汉)澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 宸ヨ祫缁撶畻鍗曪紙闆嗕綋锛� 鍏抽棴/鍙嶅叧闂� /// <summary> /// 鍏抽棴/鍙嶅叧闂伐璧勭粨绠楀崟锛堥泦浣擄級 diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" index 8d48546..935c1b3 100644 --- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" +++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" @@ -427,6 +427,65 @@ } #endregion + #region 宸ヨ祫缁撶畻鍗�(涓汉) 鎵归噺瀹℃牳 + /// <summary> + /// 瀹℃牳/鍙嶅鏍稿伐璧勭粨绠楀崟(涓汉) + /// </summary> + /// <param name="HInterID">鍗曟嵁ID</param> + /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param> + /// <param name="HMaker">瀹℃牳浜�</param> + /// <returns></returns> + [Route("Pay_SingleBalBillController/CheckAll")] + [HttpGet] + public object CheckAll(string ids, int Type, string HMaker) + { + try + { + //澶勭悊瀛楃涓� + if (!string.IsNullOrEmpty(ids)) + { + long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse); + // 澶勭悊idArray... + oCn.BeginTran(); + for (int i = 0; i < idArray.Length; i++) + { + objJsonResult = (json)GetPay_SingleBalBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц + if (objJsonResult.count == 0) + { + oCn.RollBack(); + objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�"; + return objJsonResult; + } + } + oCn.Commit(); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇烽�夋嫨姝g‘琛�"; + objJsonResult.data = null; + return objJsonResult; + } + + objJsonResult.code = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "鎵ц鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCn.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ祫缁撶畻鍗�(涓汉)澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 宸ヨ祫缁撶畻鍗�(涓汉) 鍏抽棴/鍙嶅叧闂� /// <summary> /// 鍏抽棴/鍙嶅叧闂伐璧勭粨绠楀崟(涓汉) diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml deleted file mode 100644 index af63675..0000000 --- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml +++ /dev/null @@ -1,16 +0,0 @@ -锘�<?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>F:\缃戠珯鍙戝竷\缁嶅叴闆呯惇璇篭WebAPI</PublishUrl> - <WebPublishMethod>FileSystem</WebPublishMethod> - </PropertyGroup> -</Project> \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user deleted file mode 100644 index f3f628d..0000000 --- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ /dev/null @@ -1,9 +0,0 @@ -锘�<?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> - <History>False|2024-08-19T03:24:28.4715154Z;</History> - </PropertyGroup> -</Project> \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user index 9079924..b87e209 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user @@ -12,7 +12,7 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/AlibabaCloud.EndpointUtil.dll"> <publishTime>04/07/2020 16:33:48</publishTime> @@ -117,7 +117,7 @@ <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>02/08/2023 09:47:46</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> @@ -148,7 +148,7 @@ >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>03/08/2023 15:09:56</publishTime> @@ -310,7 +310,7 @@ <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 12:02:18</publishTime> @@ -381,58 +381,58 @@ <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Config/kdapi.config"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>08/15/2022 15:46:13</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>02/08/2023 09:47:46</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> @@ -441,7 +441,7 @@ <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> @@ -450,10 +450,10 @@ <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="libman.json"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>07/18/2023 17:26:29</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="packages.config"> <<<<<<< HEAD @@ -463,109 +463,109 @@ >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/15/2022 10:06:42</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:09</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>03/31/2023 09:57:08</publishTime> </File> <File Include="Web References/WebS/Reference.map"> - <publishTime>05/25/2024 09:46:41</publishTime> + <publishTime>05/13/2024 10:26:00</publishTime> </File> <File Include="Web.config"> <<<<<<< HEAD diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user index e0401df..7c2918a 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2024-10-22T02:33:10.1961964Z;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> + <History>True|2024-10-24T09:50:10.0801119Z;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>10/22/2024 13:22:54</publishTime> + <publishTime>10/24/2024 17:49:38</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>10/22/2024 13:22:54</publishTime> + <publishTime>10/24/2024 17:49:38</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>10/22/2024 13:22:52</publishTime> + <publishTime>10/24/2024 17:49:36</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>10/22/2024 13:22:52</publishTime> + <publishTime>10/24/2024 17:49:36</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>10/22/2024 13:22:46</publishTime> + <publishTime>10/24/2024 17:49:31</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>10/22/2024 13:22:46</publishTime> + <publishTime>10/24/2024 17:49:31</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>10/22/2024 13:22:48</publishTime> + <publishTime>10/24/2024 17:49:32</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>10/22/2024 13:22:48</publishTime> + <publishTime>10/24/2024 17:49:32</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>10/22/2024 13:22:44</publishTime> + <publishTime>10/24/2024 17:49:29</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>10/22/2024 13:22:44</publishTime> + <publishTime>10/24/2024 17:49:29</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>10/22/2024 13:22:45</publishTime> + <publishTime>10/24/2024 17:49:30</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>10/22/2024 13:22:45</publishTime> + <publishTime>10/24/2024 17:49:30</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>10/22/2024 13:22:46</publishTime> + <publishTime>10/24/2024 17:49:30</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>10/22/2024 13:22:46</publishTime> + <publishTime>10/24/2024 17:49:30</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> - <publishTime>10/22/2024 13:20:29</publishTime> + <publishTime>10/24/2024 17:47:35</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> - <publishTime>10/22/2024 13:20:29</publishTime> + <publishTime>10/24/2024 17:47:35</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> - <publishTime>10/22/2024 13:20:36</publishTime> + <publishTime>10/24/2024 17:47:41</publishTime> </File> <File Include="bin/TopSdk.pdb"> - <publishTime>10/22/2024 13:20:36</publishTime> + <publishTime>10/24/2024 17:47:41</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>10/22/2024 13:23:24</publishTime> + <publishTime>10/24/2024 17:50:07</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>10/22/2024 13:23:24</publishTime> + <publishTime>10/24/2024 17:50:07</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>08/16/2024 16:55:28</publishTime> @@ -495,7 +495,7 @@ <publishTime>04/29/2024 08:30:03</publishTime> </File> <File Include="Web.config"> - <publishTime>10/12/2024 15:29:14</publishTime> + <publishTime>10/24/2024 17:40:45</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Web.config b/WebAPI/Web.config index 637ff85..bee478c 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -35,7 +35,7 @@ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�--> <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴--> <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�--> - <add key="surl" value="http://localhost/webs-web/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�--> + <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�--> <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵--> <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�--> @@ -106,13 +106,13 @@ </basicHttpBinding> </bindings> <client> - <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> + <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> </system.serviceModel> <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> - <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value> + <value>http://localhost/webs-web/webservice1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index e55bde4..ebc2c7a 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -439,6 +439,7 @@ <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" /> <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" /> + <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" /> <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" /> <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" /> <Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" /> diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index 75c707e..885014c 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index 3b80639..9297732 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index 75c707e..885014c 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index 3b80639..9297732 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache deleted file mode 100644 index f5e894a..0000000 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache +++ /dev/null Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache deleted file mode 100644 index 0312216..0000000 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59 diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt deleted file mode 100644 index f67032a..0000000 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,6 +0,0 @@ -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll deleted file mode 100644 index bfdb1a1..0000000 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll +++ /dev/null Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb deleted file mode 100644 index e26e240..0000000 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb +++ /dev/null Binary files differ -- Gitblit v1.9.1