From f34c6a21dc58bc0d40a011d6d7366c5eb3f15f15 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期五, 20 九月 2024 13:59:34 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/条码管理/WEBSController.cs | 2 +- WebAPI/Controllers/基础资料/基础资料/Gy_StockPlace_Controller.cs | 2 +- WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 2 +- Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs | 1 + WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs | 36 ++++++++++++++++++++++++++++++++++++ WebAPI/DLL/ClsGy_Material_Ctl.cs | 2 ++ 6 files changed, 42 insertions(+), 3 deletions(-) diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" index af1f432..c950ad8 100644 --- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" +++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" @@ -19,6 +19,7 @@ public Int64 HInterID;//流转卡内码 public string HBillNo;//流转卡号 public string HBatchNo;//批次 + public string HGroupNumber;//班组 } } diff --git a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs index 0c2d8d3..f32471c 100644 --- a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs +++ b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs @@ -190,6 +190,42 @@ } #endregion + #region 鍏抽敭浠剁粦瀹氭煡璇㈠悓涓�杩芥函鍗曞彿涓嬬殑鍘嗗彶鎵爜璁板綍 + [Route("Sc_KeyElementBinding/HistoryInfo_Temp")] + [HttpGet] + public object HistoryInfo_Temp(string sWhere, string user) + { + try + { + + if (sWhere == null || sWhere.Equals("")) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = new DataTable(); + return objJsonResult; + } + + ds = oCN.RunProcReturn("select","select"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 鍏抽敭浠剁粦瀹氫繚瀛� 鏂板/缂栬緫 [Route("Sc_KeyElementBinding/Save")] [HttpPost] diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs index 28e33cc..fef68a5 100644 --- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs +++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs @@ -2242,7 +2242,7 @@ oItemSubs.HDeptID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HDeptID"]); oItemSubs.HDeptNumber = ds.Tables[0].Rows[i]["HDeptNumber"].ToString(); oItemSubs.HGroupID = 0; - oItemSubs.HGroupNumber = ""; + oItemSubs.HGroupNumber = oItemSub.HGroupNumber; oItemSubs.HWorkerID = 0; oItemSubs.HWorkerNumber = ""; oItemSubs.HSourceID = 0; diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_Controller.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_Controller.cs" index 2ea6909..8c37a9f 100644 --- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_Controller.cs" +++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace_Controller.cs" @@ -37,7 +37,7 @@ { List<object> columnNameList = new List<object>(); - string sql1 = string.Format(@"select * from h_v_IF_StockPlaceList_ where 浣跨敤缁勭粐='" + Organization + "'"); + string sql1 = string.Format(@"select top 1000 * from h_v_IF_StockPlaceList_ where 浣跨敤缁勭粐='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn(sql1 + sWhere + " order by HMainID", "h_v_IF_StockPlaceList_"); diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" index 2a92436..0f517d3 100644 --- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" +++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" @@ -509,7 +509,7 @@ //鐣岄潰涓婃湭閫夋嫨浠撳簱 鎴� 浠撲綅閫夋嫨鍒楄〃鐣岄潰杈撳叆杩囨护鏉′欢 if (HWhID == 0) { - ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace"); + ds = oCn.RunProcReturn("select top 50 HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs index 850658e..c0adc2c 100644 --- a/WebAPI/DLL/ClsGy_Material_Ctl.cs +++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs @@ -53,6 +53,7 @@ "," + oModel.HMoneyDec + "," + oModel.HTaxRate + "," + oModel.HProfitRate + + "," + oModel.HLotcardQty + ",'" + oModel.HProjectBillMainID + "','" + oModel.HDivisionID + "')", ref DBUtility.ClsPub.sExeReturnInfo); @@ -225,6 +226,7 @@ ",HProfitRate=" + oModel.HProfitRate.ToString() + ",HProjectBillMainID='" + oModel.HProjectBillMainID + "'" + ",HDivisionID='" + oModel.HDivisionID + "'" + + ",HLotcardQty='" + oModel.HLotcardQty + "'" + " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo); //淇敼瀛愰」鐩唬鐮� oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); -- Gitblit v1.9.1