From 162b57f7b4394ae8dc62e13003ef4adb7e084666 Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期五, 08 十月 2021 17:48:34 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs index 6a32c6d..e6cf109 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs @@ -59,12 +59,12 @@ { if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairOutBillList " + sWhere, "h_v_Sc_MouldRepairOutBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairOutBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldRepairOutBillList"); } else { string sql1 = "select * from h_v_Sc_MouldRepairOutBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList"); } @@ -113,7 +113,7 @@ objJsonResult.data = null; return objJsonResult; } - if (oBill.omodel.HChecker != "") + if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -129,7 +129,7 @@ objJsonResult.data = null; return objJsonResult; } - bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { objJsonResult.code = "1"; @@ -238,8 +238,8 @@ } //oItem.HMaker = ""; UserName = oItem.HMaker; //鍒跺崟浜� - oItem.HBillType = "3801"; - oItem.HBillSubType = "3801"; + oItem.HBillType = "3825"; + oItem.HBillSubType = "3825"; //oItem.HBillNo = ""; //鍗曟嵁鍙� //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡 //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙� -- Gitblit v1.9.1