From 57a0098b27b5de7ad9ae10aee2157e69e8ca3b69 Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期二, 05 八月 2025 13:20:09 +0800 Subject: [PATCH] 乔一:样品销售出库,权限设置 --- WebAPI/Controllers/华远datamapping/QC_CheckNote_PNL_TempController.cs | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 210 insertions(+), 24 deletions(-) diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" index 0ff28db..503d5b1 100644 --- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" +++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" @@ -142,7 +142,7 @@ int HPosition_x = list[0].HPosition_x; int HPosition_y = list[0].HPosition_y; string HCheckProc = list[0].HCheckProc; - short HPageIndex = list[0].HPageIndex; + string HPageIndex = list[0].HPageIndex; string HBadReason = list[0].HBadReason; string HMaker = list[0].HMaker; DateTime HMakeDate = list[0].HMakeDate; @@ -181,16 +181,16 @@ } //========================================================= - DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" + - "AND HPCSNo = N'" + HPCSNo + "'", "QC_CheckNote_PNL_Temp"); - if (ds_exits.Tables[0].Rows.Count > 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } + //DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" + + // "AND HPCSNo = N'" + HPCSNo + "'", "QC_CheckNote_PNL_Temp"); + //if (ds_exits.Tables[0].Rows.Count > 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} StringBuilder sb = new StringBuilder(); sb.Append("Insert Into QC_CheckNote_PNL_Temp(HBarCode, HSetNo, HPCSNo, HPosition_x,HPosition_y,HCheckProc,HPageIndex ,HBadReason, HMaker, HMakeDate) Values("); @@ -362,7 +362,7 @@ int HPosition_x = list[0].HPosition_x; int HPosition_y = list[0].HPosition_y; string HCheckProc = list[0].HCheckProc; - short HPageIndex = list[0].HPageIndex; + string HPageIndex = list[0].HPageIndex; string HBadReason = list[0].HBadReason; string HMaker = list[0].HMaker; DateTime HMakeDate = list[0].HMakeDate; @@ -400,16 +400,16 @@ } //========================================================= - DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" + - "AND HPCSNo = N'" + HPCSNo + "' AND HItemID != " + HItemID, "QC_CheckNote_PNL_Temp"); - if (ds_exits.Tables[0].Rows.Count > 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒"; - objJsonResult.data = null; - return objJsonResult; - } + //DataSet ds_exits = oCN.RunProcReturn("select HBarCode from QC_CheckNote_PNL_Temp where HSetNo = N'" + HSetNo + "'" + + // "AND HPCSNo = N'" + HPCSNo + "' AND HItemID != " + HItemID, "QC_CheckNote_PNL_Temp"); + //if (ds_exits.Tables[0].Rows.Count > 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "SET缂栧彿鎴朠CS缂栧彿宸插瓨鍦紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} StringBuilder sb = new StringBuilder(); sb.Append("Update QC_CheckNote_PNL_Temp set "); @@ -422,7 +422,9 @@ sb.Append("HCheckProc=N'" + HCheckProc + "',"); sb.Append("HBadReason=N'" + HBadReason + "',"); sb.Append("HMaker=N'" + HMaker + "',"); - sb.Append("HMakeDate=N'" + HMakeDate + "'"); + sb.Append("HMakeDate=N'" + HMakeDate + "',"); + sb.Append("HModifyMan=N'" + msg3 + "',"); + sb.Append("HModifyDate=getdate()"); sb.Append(" Where HItemID = " + HItemID); string sql = sb.ToString(); @@ -471,6 +473,190 @@ return objJsonResult; } } - #endregion + #endregion + + #region 瀹℃牳PNL妫�楠屼俊鎭� + [Route("QC_CheckNote_PNL_TempController/CheckBill")] + [HttpGet] + public object CheckBill(int HInterID, string user, int IsAudit) + { + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("QC_CheckNote_PNL_Temp_Check", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + var ds = oCN.RunProcReturn("select top 1 HCheckMan from QC_CheckNote_PNL_Temp where HItemID=" + HInterID, "QC_CheckNote_PNL_Temp"); + if (ds.Tables[0].Rows.Count > 0) + { + if (IsAudit == 0) //瀹℃牳鍒ゆ柇 + { + if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) != true) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍稿垽鏂� + { + if (string.IsNullOrEmpty(ds.Tables[0].Rows[0]["HCheckMan"].ToString()) == true) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + + oCN.BeginTran(); + + if (IsAudit == 0) //瀹℃牳鍒ゆ柇 + { + //瀹℃牳鍓嶆帶鍒�========================================= + ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeCheckCtrl"); + if (ds == null) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + //========================================================= + + oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='" + user + "',HCheckDate=getdate() where HItemID=" + HInterID); + + //瀹℃牳鍚庢帶鍒�========================================= + DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterCheckCtrl"); + if (ds2 == null) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + //========================================================= + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛"; + objJsonResult.data = null; + } + if (IsAudit == 1) //鍙嶅鏍稿垽鏂� + { + //鍙嶅鏍稿墠鎺у埗========================================= + ds = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_BeforeUnCheckCtrl"); + if (ds == null) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + //========================================================= + + oCN.RunProc("update QC_CheckNote_PNL_Temp set HCheckMan='',HCheckDate=null where HItemID=" + HInterID); + + + //鍙嶅鏍稿悗鎺у埗========================================= + DataSet ds2 = oCN.RunProcReturn("Exec h_p_QC_CheckNote_PNL_AfterUnCheckCtrl " + HInterID + ",'" + user + "'", "h_p_QC_CheckNote_PNL_AfterUnCheckCtrl"); + if (ds2 == null) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.data = null; + return objJsonResult; + } + //========================================================= + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔�"; + objJsonResult.data = null; + } + + + + oCN.Commit(); + + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + + } + #endregion } } -- Gitblit v1.9.1