WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/Kf_ICStockBillMainController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
@@ -25,7 +25,7 @@ { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Kf_PurchaseReturnList " , "h_v_Kf_PurchaseReturnList"); ds = oCN.RunProcReturn("select * from h_v_Kf_PurchaseReturnList ", "h_v_Kf_PurchaseReturnList"); } else { @@ -74,69 +74,96 @@ // objJsonResult.data = null; // return objJsonResult; //} Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) try { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据ID为空!"; objJsonResult.data = null; return objJsonResult; } DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (IsAudit == 1) Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) { if (oBill.omodel.HBillStatus == 2) objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据ID为空!"; objJsonResult.data = null; return objJsonResult; } DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (oBill.omodel.HCloseMan != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据已审核,无需再次审核"; objJsonResult.Message = "当前单据已关闭,不能审核"; objJsonResult.data = null; return objJsonResult; } if (oBill.omodel.HDeleteMan != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据已作废,不能审核"; objJsonResult.data = null; return objJsonResult; } if (IsAudit == 1) { if (oBill.omodel.HBillStatus == 2) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据已审核,无需再次审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1239' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核成功!"; objJsonResult.data = 1; return objJsonResult; } } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1239' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核成功!"; objJsonResult.data = 1; return objJsonResult; if (oBill.omodel.HBillStatus == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据未审核,无需反审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1239' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功!"; objJsonResult.data = 1; return objJsonResult; } } } else { if (oBill.omodel.HBillStatus == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据未审核,无需反审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1239' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功!"; objJsonResult.data = 1; return objJsonResult; } objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未找到"; objJsonResult.data = null; return objJsonResult; } } else catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未找到"; objJsonResult.Message = "审核失败或反审核失败 " + e.ToString(); objJsonResult.data = null; return objJsonResult; } WebAPI/Controllers/Kf_ICStockBillMainController.cs
@@ -66,7 +66,7 @@ [HttpGet] public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName) { //flag=1 审核; flag=2 反审核 //IsAudit=1 审核; IsAudit=2 反审核 //编辑权限 //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName)) //{ @@ -76,69 +76,97 @@ // objJsonResult.data = null; // return objJsonResult; //} Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) try { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据ID为空!"; objJsonResult.data = null; return objJsonResult; } DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (IsAudit == 1) Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) { if (oBill.omodel.HBillStatus == 2) objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据ID为空!"; objJsonResult.data = null; return objJsonResult; } DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (oBill.omodel.HCloseMan != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据已审核,无需再次审核"; objJsonResult.Message = "单据已关闭,不能进行审核"; objJsonResult.data = null; return objJsonResult; } if (oBill.omodel.HDeleteMan != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据已作废,不能进行审核"; objJsonResult.data = null; return objJsonResult; } if (IsAudit == 1) { if (oBill.omodel.HBillStatus == 2) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据已审核,无需再次审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核成功!"; objJsonResult.data = 1; return objJsonResult; } } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "审核成功!"; objJsonResult.data = 1; return objJsonResult; if (oBill.omodel.HBillStatus == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据未审核,无需反审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功!"; objJsonResult.data = 1; return objJsonResult; } } } else { if (oBill.omodel.HBillStatus == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "当前单据未审核,无需反审核"; objJsonResult.data = null; return objJsonResult; } else { string HCheckDate = DateTime.Now.Date.ToString(); oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功!"; objJsonResult.data = 1; return objJsonResult; } objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未找到"; objJsonResult.data = null; return objJsonResult; } } else catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未找到"; objJsonResult.Message = "审核失败或反审核失败" + e.ToString(); objJsonResult.data = null; return objJsonResult; } WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -70,6 +70,164 @@ // #region 生产用料清单 审核/反审核 [Route("Sc_PPBomBill/DeOrAuditBill")] [HttpGet] public object DeOrAuditBill(int HInterID, int IsAudit, string CurUserName) { // string ModRightNameCheck = ""; 该模块的审核功能 DBUtility.ClsPub.CurUserName = CurUserName;//存储用户名 try { //判断是否有审核权限 //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "审核失败!无权限!"; // objJsonResult.data = null; // return objJsonResult; //} //判断id是否小于0 if (HInterID <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ID小于0"; objJsonResult.data = null; return objJsonResult; } Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); //查询审核的这条数据 ds = oCN.RunProcReturn("select * from Sc_PPBomBillMain where HInterID=" + lngBillKey, "Sc_PPBomBillMain"); if (ds.Tables[0].Rows.Count != 0) { var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); //审核 if (IsAudit == 0) { if (HChecker != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据已审核,不能再次审核!"; objJsonResult.data = null; return objJsonResult; } } if (IsAudit == 1) { if (HChecker == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据未审核,不能反审核!"; objJsonResult.data = null; return objJsonResult; } } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据不存在,原因:"+DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } //审核提交 if (IsAudit == 0) { if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "审核成功"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "审核失败"; objJsonResult.data = null; return objJsonResult; } } //反审核 if (IsAudit == 1) { if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "反审核成功"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "反审核失败"; objJsonResult.data = null; return objJsonResult; } } return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "审核失败或反审核失败" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } //审核 public bool CheckBill(Int64 lngBillKey, ref string sReturn) { try { string HChecker = DBUtility.ClsPub.CurUserName;//用户名 oCN.BeginTran();//打开事务 oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=2,hchecker='" + HChecker + "',hcheckdate='" + DateTime.Now + "' where HInterID='" + lngBillKey); oCN.Commit();//关闭事务 sReturn = "审核成功"; return true; } catch (Exception e) { sReturn = e.Message; throw(e); } } //反审核 public bool AbandonCheck(Int64 lngBillKey, ref string sReturn) { try { string HChecker = DBUtility.ClsPub.CurUserName;//用户名 oCN.BeginTran();//打开事务 oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID='" + lngBillKey); oCN.Commit();//关闭事务 sReturn = "反审核成功"; return true; } catch (Exception e) { sReturn = e.Message; throw (e); } } #endregion } } WebAPI/WebAPI.csproj
@@ -703,7 +703,6 @@ <Compile Include="Controllers\EntrustOutBackController.cs" /> <Compile Include="Controllers\EntrustOutController.cs" /> <Compile Include="Controllers\Kf_EntrustInBillController.cs" /> <Compile Include="Controllers\MateOutController.cs" /> <Compile Include="Controllers\OtherOutBillController.cs" /> <Compile Include="Controllers\OtherInStockController.cs" /> <Compile Include="Controllers\POStockInBackBillController.cs" />