From 6633722a36386002a3d1981ab6542aa8895dd54f Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期五, 04 十月 2024 22:22:34 +0800 Subject: [PATCH] 条码档案分页数据 --- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 136 +++++++++++++++++++++++++++++++++------------ 1 files changed, 99 insertions(+), 37 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index 95f0e3c..d15cceb 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; +using SyntacticSugar.constant; using System; using System.Collections; using System.Collections.Generic; @@ -225,7 +226,7 @@ if (oSystemParameter.ShowBill(ref Ret)) { //鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤 - if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�") //绯荤粺鍙傛暟 + if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧") //绯荤粺鍙傛暟 { if (HSourceID == 0) { @@ -273,6 +274,19 @@ objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "鍚堟牸鏁伴噺鍔犳姤搴熸暟閲忓姞涓嶈壇鏁伴噺涓嶈兘涓�0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + //鍒ゆ柇褰撳墠宸ュ崟鏄惁寮�宸� + else if (oSystemParameter.omodel.MES_StationOutBill_MustBeginWorkCtl == "Y") + { + ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp"); + if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠宸ュ崟涓嶆槸寮�宸ョ姸鎬佷笉鑳芥眹鎶ワ紒"; objJsonResult.data = null; return objJsonResult; } @@ -465,37 +479,37 @@ } //涓昏〃 - //LogService.Write($"5.绯荤粺鎺у埗鏌ヨ鍒ゆ柇锛岀敤鏃�" + sw.Elapsed); - //ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl"); - //if (ds == null) - //{ - // oCN.RollBack(); - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} - //LogService.Write($"5.1锛岀敤鏃�" + sw.Elapsed); - //if (ds.Tables[0].Rows.Count == 0) - //{ - // oCN.RollBack(); - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} - //LogService.Write($"5.2锛岀敤鏃�" + sw.Elapsed); - //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") - //{ - // oCN.RollBack(); - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); - // objJsonResult.data = null; - // return objJsonResult; - //} + LogService.Write($"5.绯荤粺鎺у埗鏌ヨ鍒ゆ柇锛岀敤鏃�" + sw.Elapsed); + ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl"); + if (ds == null) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + LogService.Write($"5.1锛岀敤鏃�" + sw.Elapsed); + if (ds.Tables[0].Rows.Count == 0) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�"; + objJsonResult.data = null; + return objJsonResult; + } + LogService.Write($"5.2锛岀敤鏃�" + sw.Elapsed); + if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); + objJsonResult.data = null; + return objJsonResult; + } LogService.Write($"6.鍒ゆ柇缁撴潫锛岀敤鏃�" + sw.Elapsed); oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + "," + num + ""); LogService.Write($"6.1锛岀敤鏃�" + sw.Elapsed); @@ -1702,6 +1716,58 @@ } #endregion + #region 宸ュ簭鍑虹珯姹囨姤鍗曞垪琛� + [Route("Cj_StationOutBill/page")] + [HttpGet] + public json page(string sWhere, string user, int page, int size) + { + json res = new json(); + try + { + List<object> columnNameList = new List<object>(); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) + { + res.code = "0"; + res.count = 0; + res.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!"; + res.data = null; + return res; + } + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList"); + } + else + { + ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList"); + } + + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + + res.code = CodeConstant.SUCCEED; + res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); + res.Message = "Sucess锛�"; + res.list = columnNameList; + res.data = ds.Tables[0]; + return res; + } + catch (Exception e) + { + res.code = CodeConstant.FAIL; + res.count = CountConstant.FAIL; + res.Message = "Exception锛�" + e.ToString(); + res.data = null; + return objJsonResult; + } + } + #endregion #region 宸ュ簭鍑虹珯姹囨姤鍗� 瀛愯〃鏌ヨ [Route("Cj_StationOutBill/get_SubDisplay")] [HttpGet] @@ -3683,11 +3749,7 @@ { try { - string sql = @"SELECT b.HMouldID,c.HMouldNo 妯″叿缂栫爜,c.HName 妯″叿鍚嶇О,c.HModel 妯″叿鍨嬪彿 FROM Sc_ICMOBillStatus_Tmp a LEFT JOIN( - SELECT *, ROW_NUMBER() OVER(PARTITION BY HSourceID ORDER BY HScanDate DESC) AS RowNum FROM Sc_MouldUpperBillSub - ) b ON a.HSourceID = b.HSourceID AND b.RowNum = 1 left join Gy_MouldFileMain c on b.HMouldID = c.HInterID - where b.HMouldID is not null and a.HSourceInterID ='" + HInterID + "' and a.HSourceEntryID ='" + HEntryID + "' and a.HSourceBillNo ='" + HBillNo + "'"; - ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp"); + ds = oCN.RunProcReturn("exec h_p_StationOutBill_Model '" + HInterID + "','"+ HEntryID + "' ,'" + HBillNo + "'", "h_p_StationOutBill_Model"); if (ds.Tables[0].Rows.Count != 0 && ds != null) { -- Gitblit v1.9.1