From 70907b733057d1df1657f597e245757ab31e749f Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期一, 29 四月 2024 22:50:57 +0800 Subject: [PATCH] 工艺路线实体更新 --- Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs b/Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs index 2dcdbf7..c6e8205 100644 --- a/Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs +++ b/Tiger.Business/WMS/MengQi/Biz.Mq.SNData.cs @@ -43,6 +43,7 @@ result.Message = $"閫�鍥炲垹闄ゆ潯鐮佷笉瀛樺湪"; return result; } + result.Data = data_His.DeliveryNo; var db = Db; var dbTran = db.UseTran(() => { @@ -52,6 +53,49 @@ if (!dbTran.IsSuccess) { result.IsSuccessed = false; + result.Message = $"閫�鍥炲垹闄ゆ潯鐮佸紓甯�"; + } + } + catch (Exception ex) + { + result.CatchExceptionWithLog(ex, "閫�鍥炲垹闄ゆ潯鐮佸紓甯�"); + } + return result; + } + + /// <summary> + /// 鏁村崟閫�鍥� + /// </summary> + /// <param name="deliveryNo"></param> + /// <returns></returns> + public async Task<ApiAction> ReturnWhole(string deliveryNo) + { + var result = new ApiAction(); + try + { + List<SNData_His> listHis = await Db.Queryable<SNData_His>().Where(x => x.DeliveryNo == deliveryNo).ToListAsync(); + if (listHis.Count == 0) + { + result.IsSuccessed = false; + result.Message = $"閫�鍥為�佽揣鍗昜{deliveryNo}]鏌ヤ笉鍒拌鍒犻櫎鐨勬潯鐮�"; + return result; + } + List<SNData> sndatas = await Db.Queryable<SNData>().Where(x => x.DeliveryNo == deliveryNo).ToListAsync(); + if (sndatas.Count == 0) + { + result.IsSuccessed = false; + result.Message = $"閫�鍥為�佽揣鍗昜{deliveryNo}]鏌ヤ笉鍒拌鍒犻櫎鐨勬潯鐮�"; + return result; + } + var db = Db; + var dbTran = db.UseTran(() => + { + db.Deleteable(listHis).ExecuteCommand(); + db.Deleteable(sndatas).ExecuteCommand(); + }); + if (!dbTran.IsSuccess) + { + result.IsSuccessed = false; result.Message = $"閫�鍥炲垹闄ゆ潯鐮佸紓甯�"; } } @@ -79,6 +123,7 @@ .WhereIF(!string.IsNullOrEmpty(strTime[1]) && strTime.Length == 2, x => Convert.ToDateTime(x.ScanTime) < Convert.ToDateTime(strTime[1])) .WhereIF(!string.IsNullOrEmpty(strTime[2]), x => x.ModelCode.Equals(strTime[2])) .WhereIF(!string.IsNullOrEmpty(strTime[3]), x => x.CustomerCode.Equals(strTime[3])) + .WhereIF(!string.IsNullOrEmpty(strTime[4]), x => x.DeliveryNo.Equals(strTime[4])) .ToPageListAsync(pageList.pageIndex, pageList.pageSize, total); pageList.totals = total; } @@ -89,6 +134,70 @@ res.Data = pageList; return res; } + + /// <summary> + /// 鑾峰彇鎵�鏈夋潯鐮侊紝鍘熷巶鏉$爜鍜屽鎴锋潯鐮佸湪鍚屼竴琛岋紝鎸夋潯浠� + /// </summary> + /// <param name="where"></param> + /// <returns></returns> + public async Task<ApiAction<List<SNData_His>>> GetAllSNDataHis(SNDataWhere where) + { + var res = new ApiAction<List<SNData_His>>(); + List<SNData_His> list = new List<SNData_His>(); + try + { + DateTime StartTime = DateTime.Now; + DateTime EndTime = DateTime.Now; + string[] strTime = where.strStartEnd?.Split(','); + if (!string.IsNullOrEmpty(where.strStartEnd)) { StartTime = Convert.ToDateTime(strTime[0].ToString()); EndTime = strTime.Length == 2 ? Convert.ToDateTime(strTime[1].ToString()) : DateTime.MinValue; } + RefAsync<int> total = 0; + list = await Db.Queryable<SNData_His>() + .WhereIF(!string.IsNullOrEmpty(where.strStartEnd), x => Convert.ToDateTime(x.ScanTime) > StartTime) + .WhereIF(!string.IsNullOrEmpty(where.strStartEnd) && strTime.Length == 2, x => Convert.ToDateTime(x.ScanTime) < EndTime) + .WhereIF(!string.IsNullOrEmpty(where.model), x => x.ModelCode == where.model) + .WhereIF(!string.IsNullOrEmpty(where.customerCode), x => x.CustomerCode.Equals(where.customerCode)) + .WhereIF(!string.IsNullOrEmpty(where.deliveryNo), x => x.DeliveryNo.Equals(where.deliveryNo)) + .ToListAsync(); + } + catch (Exception ex) + { + res.CatchExceptionWithLog(ex, "鏌ヨ寮傚父"); + } + res.Data = list; + return res; + } + + /// <summary> + /// 鑾峰彇鎵�鏈夋潯鐮侊紝鍘熷巶鏉$爜鍜屽鎴锋潯鐮佸垎寮�涓よ锛屾寜鏉′欢 + /// </summary> + /// <param name="where"></param> + /// <returns></returns> + public async Task<ApiAction<List<SNData>>> GetAllSNData(SNDataWhere where) + { + var res = new ApiAction<List<SNData>>(); + List<SNData> list = new List<SNData>(); + try + { + DateTime StartTime = DateTime.Now; + DateTime EndTime = DateTime.Now; + string[] strTime = where.strStartEnd?.Split(','); + if (!string.IsNullOrEmpty(where.strStartEnd)) { StartTime = Convert.ToDateTime(strTime[0].ToString()); EndTime = strTime.Length == 2 ? Convert.ToDateTime(strTime[1].ToString()) : DateTime.MinValue; } + RefAsync<int> total = 0; + list = await Db.Queryable<SNData>() + .WhereIF(!string.IsNullOrEmpty(where.strStartEnd), x => Convert.ToDateTime(x.CREATE_TIME) > StartTime) + .WhereIF(!string.IsNullOrEmpty(where.strStartEnd) && strTime.Length == 2, x => Convert.ToDateTime(x.CREATE_TIME) < EndTime) + .WhereIF(!string.IsNullOrEmpty(where.model), x => x.ItemCode == where.model) + .WhereIF(!string.IsNullOrEmpty(where.customerCode), x => x.CustomerCode.Equals(where.customerCode)) + .WhereIF(!string.IsNullOrEmpty(where.deliveryNo), x => x.DeliveryNo.Equals(where.deliveryNo)) + .OrderBy(x=>x.CREATE_TIME).OrderBy(x => x.Scanner).ToListAsync(); + } + catch (Exception ex) + { + res.CatchExceptionWithLog(ex, "鏌ヨ寮傚父"); + } + res.Data = list; + return res; + } } } } -- Gitblit v1.9.3