From 2bb4e8c477e83df7bd16585b523e532fb258e685 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 24 六月 2024 15:50:46 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/Kf_ICStockBillMainController.cs | 55 ++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 19 deletions(-) diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs index c6cbca8..e00718f 100644 --- a/WebAPI/Controllers/Kf_ICStockBillMainController.cs +++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs @@ -36,29 +36,30 @@ if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain"); + ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1 order by hmainid desc", "h_v_IF_Kf_ICStockBillMain"); } else { - string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere; + string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain"); } - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "false锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + + //if (ds.Tables[0].Rows.Count != 0 || ds != null) + //{ + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + //} + //else + //{ + //objJsonResult.code = "0"; + //objJsonResult.count = 0; + //objJsonResult.Message = "鏃犳暟鎹�"; + //objJsonResult.data = null; + //return objJsonResult; + //} } catch (Exception e) { @@ -101,6 +102,18 @@ return objJsonResult; } + //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 + string s = ""; + int sYear = 0; + int sPeriod = 0; + DateTime HDate = DateTime.Now; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.Message = s; + return objJsonResult; + } + + DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { @@ -121,7 +134,7 @@ objJsonResult.data = null; return objJsonResult; } - + if (IsAudit == 1) { if (oBill.omodel.HBillStatus == 2) @@ -136,6 +149,8 @@ { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID); + //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨 + ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','1'", "h_KF_UPDateICinventory"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "瀹℃牳鎴愬姛锛�"; @@ -157,6 +172,8 @@ { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID); + //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨 + ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','2'", "h_KF_UPDateICinventory"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒"; -- Gitblit v1.9.1