From e77cc2b8f2a713b3c414a59bfa3a4a78960c5799 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期六, 13 十二月 2025 08:56:14 +0800
Subject: [PATCH] 11
---
StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs | 144 +++---------
StandardPda/MES.Service/Dto/webApi/SalesPalletSearchDto.cs | 41 +++
StandardPda/MES.Service/Dto/webApi/SalesPalletDetailSearchDto.cs | 53 ++++
StandardPda/MES.Service/service/Warehouse/SalesPalletManager.cs | 96 ++++++++
StandardPda/MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 300 +++++++++++++-------------
5 files changed, 376 insertions(+), 258 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/webApi/SalesPalletDetailSearchDto.cs b/StandardPda/MES.Service/Dto/webApi/SalesPalletDetailSearchDto.cs
new file mode 100644
index 0000000..64cce2d
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/webApi/SalesPalletDetailSearchDto.cs
@@ -0,0 +1,53 @@
+namespace MES.Service.Dto.webApi;
+
+/// <summary>
+/// 閿�鍞墭鐩樻槑缁嗘悳绱㈣姹侱TO
+/// </summary>
+public class SalesPalletDetailSearchDto
+{
+ /// <summary>
+ /// 鎼滅储鏉′欢瀵硅薄
+ /// </summary>
+ public SalesPalletDetailSearchConditions? Conditions { get; set; }
+}
+
+/// <summary>
+/// 閿�鍞墭鐩樻槑缁嗘悳绱㈡潯浠�
+/// </summary>
+public class SalesPalletDetailSearchConditions
+{
+ /// <summary>
+ /// 鏍堟澘鐮�
+ /// </summary>
+ public string? Stackcode { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 涓昏〃ID
+ /// </summary>
+ public decimal? Mid { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string? ItemName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string? ItemModel { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public decimal? Qty { get; set; }
+}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/webApi/SalesPalletSearchDto.cs b/StandardPda/MES.Service/Dto/webApi/SalesPalletSearchDto.cs
new file mode 100644
index 0000000..55034d2
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/webApi/SalesPalletSearchDto.cs
@@ -0,0 +1,41 @@
+using MES.Service.Dto.@base;
+
+namespace MES.Service.Dto.webApi;
+
+/// <summary>
+/// 閿�鍞墭鐩樻悳绱㈣姹侱TO
+/// </summary>
+public class SalesPalletSearchDto: Page
+{
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ /// </summary>
+ public decimal? Status { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string? ItemName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ public string? ItemModel { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ public string? CheckUser { get; set; }
+
+}
+
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/StandardPda/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 75db2a3..5f1b624 100644
--- a/StandardPda/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/StandardPda/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -8,208 +8,208 @@
[SugarTable("SALES_DELIVERY_NOTICE_DETAIL")]
public class SalesDeliveryNoticeDetail
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID",
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID",
OracleSequenceName = "SEQ_DELIVERY_NOTICE_DETAIL", IsPrimaryKey = true)]
public decimal? Id { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string SalesOrderId { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_ID")]
+ public string? SalesOrderId { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_ID")]
- public string MaterialId { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_ID")]
+ public string? MaterialId { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_NAME")]
- public string MaterialName { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_NAME")]
+ public string? MaterialName { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
- public string MaterialSpecification { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
+ public string? MaterialSpecification { get; set; }
- /// <summary>
- /// 閿�鍞崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_UNIT_ID")]
- public string SalesUnitId { get; set; }
+ /// <summary>
+ /// 閿�鍞崟浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_UNIT_ID")]
+ public string? SalesUnitId { get; set; }
- /// <summary>
- /// 閿�鍞暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_QUANTITY")]
+ /// <summary>
+ /// 閿�鍞暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_QUANTITY")]
public decimal? SalesQuantity { get; set; }
- /// <summary>
- /// 鏄惁璧犲搧
- /// </summary>
- [SugarColumn(ColumnName = "IS_FREE")]
- public string IsFree { get; set; }
+ /// <summary>
+ /// 鏄惁璧犲搧
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FREE")]
+ public string? IsFree { get; set; }
- /// <summary>
- /// 瑕佽揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
public DateTime? DeliveryDate { get; set; }
- /// <summary>
- /// 鍑鸿揣浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE")]
- public string Warehouse { get; set; }
+ /// <summary>
+ /// 鍑鸿揣浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string? Warehouse { get; set; }
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
- public string PlanTrackingNumber { get; set; }
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
+ public string? PlanTrackingNumber { get; set; }
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NUMBER")]
- public string LotNumber { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NUMBER")]
+ public string? LotNumber { get; set; }
- /// <summary>
- /// 婧愬崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string SrcBillNo { get; set; }
+ /// <summary>
+ /// 婧愬崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_NO")]
+ public string? SrcBillNo { get; set; }
- /// <summary>
- /// 璁′环鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PRICE_QTY")]
+ /// <summary>
+ /// 璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICE_QTY")]
public decimal? PriceQty { get; set; }
- /// <summary>
- /// 璐т富
- /// </summary>
- [SugarColumn(ColumnName = "OWNER_ID")]
- public string OwnerId { get; set; }
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_ID")]
+ public string? OwnerId { get; set; }
- /// <summary>
- /// 搴撳瓨鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "INVENTORY_UNIT")]
- public string InventoryUnit { get; set; }
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_UNIT")]
+ public string? InventoryUnit { get; set; }
- /// <summary>
- /// 搴撳瓨鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
+ /// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
public decimal? InventoryQuantity { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲埆
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
- public string MaterialCategory { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
+ public string? MaterialCategory { get; set; }
- /// <summary>
- /// 璁″垝鍙戣揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_DELIVERY_DATE")]
+ /// <summary>
+ /// 璁″垝鍙戣揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_DELIVERY_DATE")]
public DateTime? PlanDeliveryDate { get; set; }
- /// <summary>
- /// 瓒呭彂鎺у埗鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "OUT_LMT_UNIT")]
- public string OutLmtUnit { get; set; }
+ /// <summary>
+ /// 瓒呭彂鎺у埗鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_LMT_UNIT")]
+ public string? OutLmtUnit { get; set; }
- /// <summary>
- /// 鍑哄簱涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "OUT_MAX_QTY")]
+ /// <summary>
+ /// 鍑哄簱涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_MAX_QTY")]
public decimal? OutMaxQty { get; set; }
- /// <summary>
- /// 鍑哄簱涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "OUT_MIN_QTY")]
+ /// <summary>
+ /// 鍑哄簱涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_MIN_QTY")]
public decimal? OutMinQty { get; set; }
- /// <summary>
- /// 浜よ揣鍦扮偣
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_LOC")]
- public string DeliveryLoc { get; set; }
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_LOC")]
+ public string? DeliveryLoc { get; set; }
- /// <summary>
- /// 浜よ揣鍦板潃
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERYL_ADDRESS")]
- public string DeliverylAddress { get; set; }
+ /// <summary>
+ /// 浜よ揣鍦板潃
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERYL_ADDRESS")]
+ public string? DeliverylAddress { get; set; }
- /// <summary>
- /// 婧愬崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
- public string SourceBillNo { get; set; }
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
+ public string? SourceBillNo { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_BILL_NO")]
- public string OrderBillNo { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_BILL_NO")]
+ public string? OrderBillNo { get; set; }
- /// <summary>
- /// 缁堟鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATION_STATUS")]
- public string TerminationStatus { get; set; }
+ /// <summary>
+ /// 缁堟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATION_STATUS")]
+ public string? TerminationStatus { get; set; }
- /// <summary>
- /// 缁堟鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATION_DATE")]
+ /// <summary>
+ /// 缁堟鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATION_DATE")]
public DateTime? TerminationDate { get; set; }
- /// <summary>
- /// 绱鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "SUM_OUT_QTY")]
+ /// <summary>
+ /// 绱鍑哄簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SUM_OUT_QTY")]
public decimal? SumOutQty { get; set; }
- /// <summary>
- /// 鏈嚭搴撴暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "REMAIN_OUT_QTY")]
+ /// <summary>
+ /// 鏈嚭搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "REMAIN_OUT_QTY")]
public decimal? RemainOutQty { get; set; }
- /// <summary>
- /// ERP琛孖D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_LINE_ID")]
- public string ErpLineId { get; set; }
+ /// <summary>
+ /// ERP琛孖D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_LINE_ID")]
+ public string? ErpLineId { get; set; }
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_HEAD_ID")]
+ public string? ErpHeadId { get; set; }
/// <summary>
/// ERP澶碔D
///</summary>
//[SugarColumn(ColumnName = "f_UNW_Base_GDY")]
- //public string GDY { get; set; }
+ //public string? GDY { get; set; }
///// <summary>
///// 澶囨敞
/////</summary>
//[SugarColumn(ColumnName = "FEntrynote")]
- //public string NOTE { get; set; }
+ //public string? NOTE { get; set; }
/// <summary>
/// 瑕佽揣鏃ユ湡
/// </summary>
diff --git a/StandardPda/MES.Service/service/Warehouse/SalesPalletManager.cs b/StandardPda/MES.Service/service/Warehouse/SalesPalletManager.cs
new file mode 100644
index 0000000..645b536
--- /dev/null
+++ b/StandardPda/MES.Service/service/Warehouse/SalesPalletManager.cs
@@ -0,0 +1,96 @@
+using MES.Service.DB;
+using MES.Service.Dto.service;
+using MES.Service.Dto.webApi;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+/// <summary>
+/// 閿�鍞墭鐩樼鐞嗘湇鍔�
+/// </summary>
+public class SalesPalletManager : Repository<SalesPallet>
+{
+ /// <summary>
+ /// 鑾峰彇閿�鍞墭鐩樺垎椤垫暟鎹�
+ /// </summary>
+ /// <param name="request">鏌ヨ璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public (List<SalesPalletQueryDto> item, int TotalCount)
+ GetSalesPalletPage(SalesPalletSearchDto request)
+ {
+ var query = Db.Queryable<SalesPallet>()
+ .LeftJoin<SalesDeliveryNotice>((z, a) => a.BillNo == z.BillNo)
+ .LeftJoin<SalesDeliveryNoticeDetail>((z, a, b) =>
+ a.ErpId == b.ErpHeadId && z.ItemId.ToString() == b.MaterialId)
+ .LeftJoin<MesItems>((z, a, b, s) => s.Id.ToString() == b.MaterialId)
+ .LeftJoin<MesUnit>((z, a, b, s, u) =>
+ u.Id.ToString() == b.SalesUnitId)
+ .LeftJoin<SysUser>((z, a, b, s, u, su) => su.Fcode == z.CheckUser)
+ .LeftJoin<MesDepots>((z, a, b, s, u, su, d) =>
+ d.DepotId.ToString() == b.Warehouse)
+ .WhereIF(!string.IsNullOrEmpty(request.BillNo),
+ (z, a, b, s, u, su, d) => z.BillNo.Contains(request.BillNo))
+ .WhereIF(!string.IsNullOrEmpty(request.ItemNo),
+ (z, a, b, s, u, su, d) => s.ItemNo.Contains(request.ItemNo))
+ .WhereIF(!string.IsNullOrEmpty(request.ItemName),
+ (z, a, b, s, u, su, d) => s.ItemName.Contains(request.ItemName))
+ .WhereIF(request.Status.HasValue,
+ (z, a, b, s, u, su, d) => z.Status == request.Status)
+ .Select((z, a, b, s, u, su, d) => new SalesPalletQueryDto
+ {
+ Id = z.Id,
+ Status = z.Status,
+ CheckDate = z.CheckDate,
+ CheckUser = su.Fname,
+ BillNo = z.BillNo,
+ ItemNo = s.ItemNo,
+ ItemName = s.ItemName,
+ ItemModel = s.ItemModel,
+ UnitName = u.Fname,
+ Xsdd = b.SalesQuantity,
+ Yb = z.SalesQuantity,
+ Wyj = a.BillNo + s.Id.ToString()
+ });
+
+ var totalCount = 0;
+ var items = query.ToPageList(request.PageIndex, request.Limit,
+ ref totalCount);
+
+ return (items, totalCount);
+ }
+
+ public List<SalesPalletDetailQueryDto>
+ GetSalesPalletDetail(SalesPalletDetailQueryDto request)
+ {
+ var subQuery = Db.Queryable<MesPalletBinding1>()
+ .LeftJoin<Womdaa>((a, b) => a.TicketNo == b.Daa001)
+ .LeftJoin<MesItems>((a, b, it) => it.Id.ToString() == b.Daa002)
+ .GroupBy((a, b, it) => new { a.Stackcode, it.Id })
+ .Select((a, b, it) => new
+ {
+ StackCode = a.Stackcode,
+ ItemId = it.Id,
+ ItemNo = SqlFunc.AggregateMax(it.ItemNo),
+ ItemName = SqlFunc.AggregateMax(it.ItemName),
+ ItemModel = SqlFunc.AggregateMax(it.ItemModel)
+ });
+
+ var query = Db.Queryable<SalesPalletDetail>()
+ .LeftJoin(subQuery, (b, o) => b.Stackcode == o.StackCode)
+ .Where((b, o) => b.Mid == request.Mid)
+ .Select((b, o) => new SalesPalletDetailQueryDto
+ {
+ Id = b.Id,
+ Mid = b.Mid,
+ BillNo = b.BillNo,
+ Stackcode = b.Stackcode,
+ Qty = b.Qty,
+ ItemNo = o.ItemNo,
+ ItemName = o.ItemName,
+ ItemModel = o.ItemModel
+ });
+
+ return query.ToList();
+ }
+}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs b/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
index 6415181..7c73129 100644
--- a/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
+++ b/StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
@@ -1,3 +1,4 @@
+using MES.Service.Dto.webApi;
using MES.Service.util;
using MES.Service.service.Warehouse;
using Microsoft.AspNetCore.Mvc;
@@ -14,15 +15,45 @@
private readonly SalesPalletManager _manager = new();
/// <summary>
- /// 鑾峰彇閿�鍞墭鐩樹俊鎭�
+ /// 鑾峰彇閿�鍞墭鐩樺垎椤垫暟鎹�
/// </summary>
- /// <returns>閿�鍞墭鐩樹俊鎭垪琛�</returns>
- [HttpPost("GetSalesPalletInfo")]
- public ResponseResult GetSalesPalletInfo()
+ /// <param name="request">鏌ヨ璇锋眰鍙傛暟</param>
+ /// <returns>鍒嗛〉缁撴灉</returns>
+ [HttpPost("GetSalesPalletPage")]
+ public ResponseResult GetSalesPalletPage(
+ [FromBody] SalesPalletSearchDto request)
{
try
{
- var result = _manager.GetSalesPalletInfo();
+ var (items, totalCount) = _manager.GetSalesPalletPage(request);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = items,
+ TotalCount = totalCount
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇閿�鍞墭鐩樻槑缁嗘暟鎹�
+ /// </summary>
+ /// <param name="request">鏌ヨ璇锋眰鍙傛暟</param>
+ /// <returns>鏄庣粏鍒楄〃</returns>
+ [HttpPost("GetSalesPalletDetail")]
+ public ResponseResult GetSalesPalletDetail(
+ [FromBody] SalesPalletDetailQueryDto request)
+ {
+ try
+ {
+ var result = _manager.GetSalesPalletDetail(request);
+
return new ResponseResult
{
status = 0,
@@ -35,107 +66,4 @@
return ResponseResult.ResponseError(ex);
}
}
-
- /// <summary>
- /// 鏍规嵁鏉′欢鑾峰彇閿�鍞墭鐩樹俊鎭�
- /// </summary>
- /// <param name="request">鏌ヨ鏉′欢</param>
- /// <returns>閿�鍞墭鐩樹俊鎭垪琛�</returns>
- [HttpPost("GetSalesPalletInfoByCondition")]
- public ResponseResult GetSalesPalletInfoByCondition([FromBody] SalesPalletQueryRequest request)
- {
- try
- {
- var result = _manager.GetSalesPalletInfo(request.BillNo, request.ItemId, request.Status);
- return new ResponseResult
- {
- status = 0,
- message = "鏌ヨ鎴愬姛",
- data = result
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇閿�鍞墭鐩樻槑缁嗕俊鎭�
- /// </summary>
- /// <returns>閿�鍞墭鐩樻槑缁嗕俊鎭垪琛�</returns>
- [HttpPost("GetSalesPalletDetailInfo")]
- public ResponseResult GetSalesPalletDetailInfo()
- {
- try
- {
- var result = _manager.GetSalesPalletDetailInfo();
- return new ResponseResult
- {
- status = 0,
- message = "鏌ヨ鎴愬姛",
- data = result
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鏍堟澘鐮佽幏鍙栭攢鍞墭鐩樻槑缁嗕俊鎭�
- /// </summary>
- /// <param name="request">鏌ヨ鏉′欢</param>
- /// <returns>閿�鍞墭鐩樻槑缁嗕俊鎭垪琛�</returns>
- [HttpPost("GetSalesPalletDetailInfoByStackcode")]
- public ResponseResult GetSalesPalletDetailInfoByStackcode([FromBody] SalesPalletDetailQueryRequest request)
- {
- try
- {
- var result = _manager.GetSalesPalletDetailInfo(request.Stackcode);
- return new ResponseResult
- {
- status = 0,
- message = "鏌ヨ鎴愬姛",
- data = result
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
-
-/// <summary>
-/// 閿�鍞墭鐩樻煡璇㈣姹�
-/// </summary>
-public class SalesPalletQueryRequest
-{
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public decimal? ItemId { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- public decimal? Status { get; set; }
-}
-
-/// <summary>
-/// 閿�鍞墭鐩樻槑缁嗘煡璇㈣姹�
-/// </summary>
-public class SalesPalletDetailQueryRequest
-{
- /// <summary>
- /// 鏍堟澘鐮�
- /// </summary>
- public string? Stackcode { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3