From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期五, 14 四月 2023 09:23:25 +0800 Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑; 1.生产资源 有异常; 删除有问题,删除后出来 异常数据( ); 其他信息 里的 几个字段 输入 字符时 报错,应提示; 2.工序 : 9999的 转工序 , 有个 转工序 字段,是否没显示出来; 其他信息 里的 几个字段 输入 字符时 报错,应提示; 3.工作中心: 其他信息 里的 几个字段 输入 字符时 报错,应提示; 4.生产班组: 刷新出来 异常数据; 其他信息 里的 几个字段 输入 字符时 报错,应提示; 5.基础资料的 一些 复选框 标题不对; 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑; 7.工艺路线查询;工序号,工序代码,工序,工艺参数,表体备注, 其他的放后面 子表 的 委外标记 放到最后面去; 并且 把 供应商代码和供应商 放出来(也放在最后几个); 8.部门有 很多异常数据; 选择的时候 出来了; 9.流转卡维护, 表头 很多没有用的列,单据号 日期 都没有显示; 转工序 是否要打印(跟客户确认); 10. 流转卡拆分时,一些 列的 排序; --- WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 17 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs index 017b2b8..e28d3ab 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs @@ -89,7 +89,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -99,6 +99,7 @@ } ds = Sc_GetMouldProdMoveBill(sWhere,Organization); + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; @@ -120,11 +121,11 @@ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where (璋冨叆缁勭粐='" + Organization + "' or 璋冨嚭缁勭粐='" + Organization + "')"); if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdMoveBillList"); + return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldProdMoveBillList"); } else { - string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc"; + string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList"); } @@ -155,6 +156,8 @@ public object Sc_MouldProdMoveBillListProjectDetai(string sqlWhere) { DataSet ds; + DataSet ds1; + List<object> list = new List<object>(); try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); @@ -164,12 +167,8 @@ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID,璋冨叆缁勭粐浠g爜 HStockOrgCode,璋冨叆缁勭粐 HStockOrgName, HOtherOrgID ,璋冨嚭缁勭粐浠g爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠g爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID, 璋冨叆浠撲綅浠g爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠g爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID, - 璋冨嚭浠撲綅浠g爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅 FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList"); + 璋冨嚭浠撲綅浠g爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁¢噺鍗曚綅浠g爜 HUnitCode,璁¢噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList"); - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; } else { @@ -179,15 +178,22 @@ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID,璋冨叆缁勭粐浠g爜 HStockOrgCode,璋冨叆缁勭粐 HStockOrgName, HOtherOrgID ,璋冨嚭缁勭粐浠g爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠g爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID, 璋冨叆浠撲綅浠g爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠g爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID, - 璋冨嚭浠撲綅浠g爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅 FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 "); + 璋冨嚭浠撲綅浠g爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁¢噺鍗曚綅浠g爜 HUnitCode,璁¢噺鍗曚綅 HUnitName FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 "); string sql = sql1 + sqlWhere; ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList"); - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; } + //鏌ユ眹鎬� + ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠g爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺, + HSCWHID,max(璋冨嚭浠撳簱浠g爜)璋冨嚭浠撳簱浠g爜,max(璋冨嚭浠撳簱)璋冨嚭浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldProdMoveBillList + where 1=1 " + sqlWhere + " group by 鐗╂枡浠g爜,瑙勬牸鍨嬪彿,HSCWHID,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldProdMoveBillList"); + + list.Add(ds.Tables[0]); + list.Add(ds1.Tables[0]); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.list = list; } catch (Exception e) { @@ -221,7 +227,7 @@ ListModels oListModels = new ListModels(); try { - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, false, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -310,10 +316,16 @@ { // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); + oCn.RunProc(sql); } else { bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼鎴愬姛 + //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' "); + string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID "); + oCn.RunProc(sql); } if (bResult) { @@ -354,7 +366,7 @@ public object DeltetMouldProdMoveBilll(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -393,10 +405,21 @@ objJsonResult.data = null; return objJsonResult; } - + //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D + //string swhere = ""; + //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub"); + //for (var i = 0; i < ds.Tables[0].Rows.Count; i++) + //{ + // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ","; + //} + //swhere = swhere.Substring(0, swhere.Length - 1); bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { + //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗f浣嶇疆 + //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' "); + string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID "); + oCn.RunProc(sql); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; @@ -431,7 +454,7 @@ { //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍� //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; -- Gitblit v1.9.1