From 1f72ccdc6093a5b44910bd73a78a27f7226325b2 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 13 十一月 2025 10:55:58 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 21 +++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Outbound/OutboundOrderGetDTO.cs | 160 +++++++++++++++++++++++++++++++++++++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs | 5
3 files changed, 181 insertions(+), 5 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_DTO/Basic/SupplierDTO.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_DTO/Basic/SupplierDTO.cs"
index 17c6c4d..b051017 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_DTO/Basic/SupplierDTO.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_DTO/Basic/SupplierDTO.cs"
@@ -82,8 +82,7 @@
public class WarehouseRequest
{
public List<WarehouseAreaDto> warehouses { get; set; }
-
- public List<string> delWarehouseCodes { get; set; }
+
}
@@ -93,5 +92,7 @@
public string Code { get; set; }
public string Name { get; set; }
public string FactoryArea { get; set; }
+
+ public int IsDelete { get; set; }
}
}
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_DTO/Outbound/OutboundOrderGetDTO.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_DTO/Outbound/OutboundOrderGetDTO.cs"
index af72465..88aa0f7 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_DTO/Outbound/OutboundOrderGetDTO.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_DTO/Outbound/OutboundOrderGetDTO.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Microsoft.AspNetCore.Components.Forms;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -22,7 +23,7 @@
public string Operator { get; set; }
}
-
+
public class PickingConfirmRequest
{
public int OrderDetailId { get; set; }
@@ -33,7 +34,7 @@
public string PalletCode { get; set; }
public int StockId { get; set; } // 搴撳瓨ID
public int OutStockLockInfoId { get; set; } // 鍑哄簱閿佸畾淇℃伅ID
- }
+ }
public class DirectOutboundRequest
{
@@ -59,4 +60,157 @@
public string TargetLocation { get; set; }
public DateTime CompleteTime { get; set; }
}
+ public class InputDto { }
+
+ public class OutputDto { }
+ #region 鍏ュ弬DTO
+ public class ScanCodeValidateInput : InputDto
+ {
+ public string ScanCode { get; set; } = string.Empty; // 鎵弿鐨勬潯鐮�
+ public string OrderNo { get; set; } = string.Empty; // 鍑哄簱鍗曞彿
+ }
+
+ public class PickingConfirmInput : InputDto
+ {
+ public string TaskNum { get; set; } = string.Empty; // 浠诲姟鍙�
+ public string PalletCode { get; set; } = string.Empty; // 鎵樼洏鐮�
+ public string MaterielBarcode { get; set; } = string.Empty; // 鐗╂枡鏉＄爜
+ }
+
+ public class SplitPackageInput : InputDto
+ {
+ public long OutStockLockId { get; set; } // 寰呮媶鍒嗙殑鍑哄簱璇︽儏ID
+ public string NewBarcode { get; set; } = string.Empty; // 鏂版潯鐮�
+ public decimal SplitQty { get; set; } // 鏂版潯鐮佸垎閰嶆暟閲�
+ }
+
+ public class StockReturnInput : InputDto
+ {
+ public string OrderNo { get; set; } = string.Empty; // 鍑哄簱鍗曞彿
+ public string TaskNum { get; set; } = string.Empty; // 浠诲姟鍙凤紙鍙�夛級
+ }
+
+ public class OutStockLockDetailInput : InputDto
+ {
+ public long OutStockLockId { get; set; } // 鍑哄簱璇︽儏ID
+ }
+ #endregion
+
+ #region 鍑哄弬DTO
+ //[AutoMapFrom(typeof(OutStockLockInfo))]
+ public class OutStockLockInfoOutput : OutputDto
+ {
+ public string TaskNum { get; set; } = string.Empty;
+ public string PalletCode { get; set; } = string.Empty;
+ public string CurrentBarcode { get; set; } = string.Empty;
+ public decimal AssignQuantity { get; set; }
+ public decimal PickedQty { get; set; }
+ public int Status { get; set; }
+ public bool IsSplitted { get; set; }
+ }
+
+ //[AutoMapFrom(typeof(OutStockLockInfo))]
+ public class OutStockLockDetailOutput : OutputDto
+ {
+ public string CurrentBarcode { get; set; } = string.Empty;
+ public decimal AssignQuantity { get; set; }
+ }
+
+ public class MaterielBarcodeValidateOutput : OutputDto
+ {
+ public bool IsValid { get; set; }
+ public long OutStockLockId { get; set; }
+ public decimal PackageQty { get; set; } // 鍒嗛厤鏁伴噺
+ public string Message { get; set; } = string.Empty;
+ }
+
+ //[AutoMapFrom(typeof(PickingRecord))]
+ public class PickingRecordOutput : OutputDto
+ {
+ public string Barcode { get; set; } = string.Empty;
+ public string PalletCode { get; set; } = string.Empty;
+ public decimal PickQuantity { get; set; }
+ public string PickTime { get; set; } = string.Empty;
+ }
+ #endregion
+
+ public class ScanCodeValidateReq
+ {
+ public string ScanCode { get; set; } = string.Empty; // 鎵弿鐨勬潯鐮�
+ public string OrderNo { get; set; } = string.Empty; // 鍑哄簱鍗曞彿
+ }
+
+
+
+ public class PickingConfirmReq
+ {
+ public string TaskNum { get; set; } = string.Empty; // 浠诲姟鍙�
+ public string PalletCode { get; set; } = string.Empty; // 鎵樼洏鐮�
+ public string MaterielBarcode { get; set; } = string.Empty; // 鐗╂枡鏉＄爜
+ }
+
+
+
+ public class SplitPackageReq
+ {
+ public long OutStockLockId { get; set; } // 寰呮媶鍒嗙殑鍑哄簱璇︽儏ID
+ public string NewBarcode { get; set; } = string.Empty; // 鏂版潯鐮�
+ public decimal SplitQty { get; set; } // 鏂版潯鐮佸垎閰嶆暟閲�
+ }
+
+
+
+ public class StockReturnReq
+ {
+ public string OrderNo { get; set; } = string.Empty; // 鍑哄簱鍗曞彿
+ public string TaskNum { get; set; } = string.Empty; // 浠诲姟鍙凤紙鍙�夛級
+ }
+
+
+
+ public class OutStockLockDetailReq
+ {
+ public long OutStockLockId { get; set; } // 鍑哄簱璇︽儏ID
+ }
+
+
+
+ public class MaterielBarcodeValidateResp
+ {
+ public bool IsValid { get; set; }
+ public long OutStockLockId { get; set; }
+ public decimal PackageQty { get; set; } // 鏁村寘鏁伴噺锛堝垎閰嶆暟閲忥級
+ public string Message { get; set; } = string.Empty;
+ }
+
+
+ public class OutStockLockDetailResp
+ {
+ public string CurrentBarcode { get; set; } = string.Empty;
+ public decimal AssignQuantity { get; set; }
+ }
+
+
+
+ public class OutStockLockListResp
+ {
+ public long Id { get; set; }
+ public string TaskNum { get; set; } = string.Empty;
+ public string PalletCode { get; set; } = string.Empty;
+ public string CurrentBarcode { get; set; } = string.Empty;
+ public decimal AssignQuantity { get; set; }
+ public decimal PickedQty { get; set; }
+ public int Status { get; set; }
+ public bool IsSplitted { get; set; }
+ }
+
+
+
+ public class PickedRecordListResp
+ {
+ public string barcode { get; set; } = string.Empty;
+ public string palletCode { get; set; } = string.Empty;
+ public decimal pickQuantity { get; set; }
+ public string pickTime { get; set; } = string.Empty;
+ }
}
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/OutboundPickingService.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/OutboundPickingService.cs"
index 5a87c34..82df3f5 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/OutboundPickingService.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/OutboundPickingService.cs"
@@ -46,6 +46,27 @@
_splitPackageService = splitPackageService;
}
+
+ #region 鏌ヨ鍑哄簱璇︽儏鍒楄〃
+ public async Task<List<OutStockLockListResp>> GetOutStockLockListAsync(string orderNo)
+ {
+ var locks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
+ .Where(t => t.OrderNo == orderNo)
+ .ToListAsync();
+
+ return locks.Select(t => new OutStockLockListResp
+ {
+ Id = t.Id,
+ // TaskNum = t.TaskNum,
+ PalletCode = t.PalletCode,
+ CurrentBarcode = t.CurrentBarcode,
+ AssignQuantity = t.AssignQuantity,
+ PickedQty = t.PickedQty,
+ Status = t.Status,
+ // IsSplitted = t.IsSplitted
+ }).ToList();
+ }
+ #endregion
public async Task<WebResponseContent> ValidateBarcode(string barcode)
{
try
--
Gitblit v1.9.3