From 19e538209cb007df7001ca218eb6e1a94ff1db60 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 18 十一月 2025 14:27:44 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs | 54 ++++++++++++++++++++++++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs | 9 ++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 32 ++++++++++++++++
3 files changed, 93 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs"
index d7f61a5..82643b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/AllocateEnum/BusinessTypeEnum.cs"
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,7 +12,58 @@
鏅轰粨璋冩櫤浠�=1,
鏅轰粨璋冨閮ㄤ粨搴�=2,
澶栭儴浠撳簱璋冩櫤浠�=3
+ }
+ public enum MESDocumentType
+ {
+ /// <summary>閲囪喘鍏ュ簱锛堝叆搴撶被鍨嬶級</summary>
+ [Description("閲囪喘鍏ュ簱")]
+
+ PurchaseInbound = 11,
+
+ /// <summary>鏉傛敹鍗曪紙鍏ュ簱绫诲瀷锛�</summary>
+ [Description("鏉傛敹鍗�")]
+
+ MiscellaneousInbound = 12,
+
+ /// <summary>鐢熶骇閫�鏂欏崟锛堝叆搴撶被鍨嬶級</summary>
+ [Description("鐢熶骇閫�鏂欏崟")]
+
+ ProductionReturn = 13,
+
+ /// <summary>澶栧崗閫�鏂欏崟锛堝叆搴撶被鍨嬶級</summary>
+ [Description("澶栧崗閫�鏂欏崟")]
+
+ OutsourcingReturn = 14,
+
+ /// <summary>閿�鍞��搴撳崟锛堝叆搴撶被鍨嬶級</summary>
+ [Description("閿�鍞��搴撳崟")]
+
+ SalesReturn = 15,
+
+ /// <summary>宸ュ崟棰嗘枡鍗曠敵璇峰崟锛堝嚭搴撶被鍨嬶級</summary>
+ [Description("宸ュ崟棰嗘枡鍗曠敵璇峰崟")]
+
+ WorkOrderMaterialRequest = 21,
+
+ /// <summary>鏉傚彂鍗曪紙鍑哄簱绫诲瀷锛�</summary>
+ [Description("鏉傚彂鍗�")]
+
+ MiscellaneousOutbound = 22,
+
+ /// <summary>閫�璐у崟锛堝嚭搴撶被鍨嬶級</summary>
+ [Description("閫�璐у崟")]
+
+ ReturnOrder = 23,
+
+ /// <summary>閿�鍞嚭搴撳崟锛堝嚭搴撶被鍨嬶級</summary>
+ [Description("閿�鍞嚭搴撳崟")]
+
+ SalesOutbound = 24,
+
+ /// <summary>澶栧崗棰嗘枡鐢宠鍗曪紙鍑哄簱绫诲瀷锛�</summary>
+ [Description("澶栧崗棰嗘枡鐢宠鍗�")]
+
+ OutsourcingMaterialRequest = 25
}
-
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
index 4bc7409..bca654b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
@@ -1,9 +1,11 @@
锘縰sing Microsoft.Extensions.Logging;
+using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
@@ -256,5 +258,35 @@
}
}
+
+
+ public override PageGridData<Dt_OutboundOrderDetail> GetPageData(PageDataOptions options)
+ {
+ //var pageGridData = base.GetPageData(options);
+
+ ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+
+ List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ int totalCount = 0;
+ if (searchParametersList.Count > 0)
+ {
+ {
+ SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.OrderId).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId== searchParameters.Value.ObjToInt());
+ var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
+ }
+ }
+
+
+ }
+ }
+ return new PageGridData<Dt_OutboundOrderDetail> ();
+ }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
index ce818ba..b86b652 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
@@ -1,9 +1,11 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
@@ -27,6 +29,11 @@
// return Service.GetOutboundStockDataById(id);
//}
-
+
+ public override ActionResult GetPageData(PageDataOptions options)
+ {
+ return Json( Service.GetPageData(options));
+ }
+
}
}
--
Gitblit v1.9.3