From 7e8fbf96c0e985791b7aad451b1b33d933ba77df Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 29 七月 2024 16:56:11 +0800 Subject: [PATCH] 库存检验单 增加 批次号,检验数量,良品数量,报废数量,可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(18,8) --检验数量 HRightQty dec(18,8) --合格数量 HUnRightQty dec(18,8) --不合格数量 HUnKnowQty dec(18,8) --可疑数量 实验室 仪器检验时,扫码流转卡二维码的, 改为 可以扫 取样单 二维码(即 可以扫流转卡也可以扫取样单)。 检验单里 保存 对应的 取样单 内码; 首件单,巡检单,工序检验单 表头增加 字段 HTakeSampleCheckBillID int --取样单内码 HTakeSampleCheckBillNo int --取样单 出站单 :增加 字段: 返工数,工废数量,料废数量 ,料废返工数量 HBackWorkQty dec(18,8) -- 返工数 HBadByWorkQty dec(18,8) -- 工废数量 HBadByMaterQty dec(18,8) --料废数量 HBackWorkByMaterQty dec(18,8) --料废返工数量 --- WebAPI/Controllers/LMESController.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index 267935f..f35200a 100644 --- a/WebAPI/Controllers/LMESController.cs +++ b/WebAPI/Controllers/LMESController.cs @@ -510,7 +510,16 @@ objJsonResult.data = null; return objJsonResult; } - + ds = oCN.RunProcReturn(@"select * from Sc_ICMOBillStatus_Tmp where HSourceInterID='"+ HInterID + "' and HSourceEntryID='"+ HEntryID + "'", "Sc_ICMOBillStatus_Tmp"); + if (ds.Tables[0].Rows.Count != 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇ュ伐搴忓凡娲惧崟,涓嶅厑璁搁噸澶嶆帓鍗曪紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran(); oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSourceID + " where HInterID=" + HInterID + " and HEntryID=" + HEntryID); @@ -1867,6 +1876,44 @@ } #endregion + #region 铻烘瘝妫�楠孋CD鍚堟牸鐜� + [Route("LEMS/Sc_NutInspectionCCDPassRate")] + [HttpGet] + public object Sc_NutInspectionCCDPassRate(string HBatchNo, string user) + { + try + { + DataSet ds; + List<object> columnNameList = new List<object>(); + + ds = oCN.RunProcReturn("exec h_p_Sc_NutInspectionCCDPassRate '" + HBatchNo + "'", "h_p_Sc_NutInspectionCCDPassRate"); + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 閿�鍞粺璁℃姤琛� [Route("LEMS/SeOutReportList")] [HttpGet] -- Gitblit v1.9.1