From e4647b3bc4aca9690261df83f9055abdf8c17406 Mon Sep 17 00:00:00 2001 From: yxj <1qaz@123> Date: 星期四, 13 四月 2023 15:36:27 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index acdf976..79fcc6f 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -176,14 +176,14 @@ objJsonResult.data = null; return objJsonResult; } - if (HEmpID == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�"; - objJsonResult.data = null; - return objJsonResult; - } + //if (HEmpID == 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} //if (HQCCheckID == 0) //{ // objJsonResult.code = "0"; @@ -192,14 +192,14 @@ // objJsonResult.data = null; // return objJsonResult; //} - //if (HSourceID == 0) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (HSourceID == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�"; + objJsonResult.data = null; + return objJsonResult; + } //if (HCenterID == 0) //{ // objJsonResult.code = "0"; @@ -1641,6 +1641,17 @@ return objJsonResult; } + ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill"); + + if (ds.Tables[0].Rows[0][0].ToString()== "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�"; + objJsonResult.data = null; + return objJsonResult; + } + //鍐欏叆鍒犻櫎鏃ュ織 string WorkList = "鍒犻櫎鍑虹珯鍗曪細" + oBill.omodel.HBillNo; if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo)) -- Gitblit v1.9.1