From 105bb5f0f4edd01d8f915ffda28ccd37afbfddc8 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 24 四月 2023 08:29:41 +0800 Subject: [PATCH] 基础资料 添加校验控制 进站单出站单扫完流转卡默认带出最大工序汇报数量(获取 上一道的 合格数量(如果拆分后,上道合格数量大于流转卡数量时,仍取流转卡数量),如果是第一道则获取流转卡数量) 拆卡必须最大工序出站之后才允许拆卡,汇报过的工序拆卡出来不需要显示 增加生产订单 复制功能; 流转卡添加复制功能 工艺路线 增加 上一行 下一行 刷新流水号 按钮功能, 可以调整 工序上下次序; 以及重新刷新流水号 --- WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 72 ++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 20 deletions(-) diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs index d3dd532..7d36d09 100644 --- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs +++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs @@ -29,36 +29,47 @@ /// </summary> [Route("QC_OutCompCheckBill/GetOutCompCheckBillList")] [HttpGet] - public object GetOutCompCheckBillList(string sWhere) + public object GetOutCompCheckBillList(string sWhere,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_QC_OutCompCheckBillList " + sWhere, "h_v_QC_OutCompCheckBillList"); + ds = oCN.RunProcReturn("select * from h_v_QC_OutCompCheckBillList order by hmainid desc ", "h_v_QC_OutCompCheckBillList"); } else { string sql1 = "select * from h_v_QC_OutCompCheckBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList"); } - 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) { @@ -152,8 +163,19 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<QC_OutCompCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillMain>>(msg2); int HYear = 2021; @@ -267,10 +289,20 @@ /// <returns></returns> [Route("QC_OutCompCheckBill/DeltetOutCompCheckBill")] [HttpGet] - public object DeltetOutCompCheckBill(string HInterID) + public object DeltetOutCompCheckBill(string HInterID,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran(); oCN.RunProc("Delete From QC_OutCompCheckBillMain where HInterID = " + HInterID); oCN.RunProc("Delete From QC_OutCompCheckBillSub where HInterID = " + HInterID); -- Gitblit v1.9.1