From 3946fe3c23ff022b7e1d27c2a29041496ef6d529 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

---
 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/Dto/MaterialSortingServiceOutput.cs |  338 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 169 insertions(+), 169 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/Dto/MaterialSortingServiceOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/Dto/MaterialSortingServiceOutput.cs
index 7804b78..22631da 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/Dto/MaterialSortingServiceOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/MaterialSorting/Dto/MaterialSortingServiceOutput.cs
@@ -1,204 +1,204 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Admin.NET.Core;
+锘�//using Microsoft.EntityFrameworkCore;
+//using System;
+//using System.Collections.Generic;
+//using System.ComponentModel.DataAnnotations;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+//using Admin.NET.Core;
 
-namespace Admin.NET.Application
-{
-    /// <summary>
-    /// 鑾峰彇鎵樼洏鐗╂枡鍒嗘嫞鍙傛暟
-    /// </summary>
-    public class GetSortInfoOutput
-    {
-        /// <summary>
-        /// 瀹瑰櫒
-        /// </summary>
-        public WmsContainerDto WmsContainer { get; set; }
+//namespace Admin.NET.Application
+//{
+//    /// <summary>
+//    /// 鑾峰彇鎵樼洏鐗╂枡鍒嗘嫞鍙傛暟
+//    /// </summary>
+//    public class GetSortInfoOutput
+//    {
+//        /// <summary>
+//        /// 瀹瑰櫒
+//        /// </summary>
+//        public WmsContainerDto WmsContainer { get; set; }
 
-        /// <summary>
-        /// 鍒嗘嫞淇℃伅
-        /// </summary>
-        public List<WmsSortOrder> WmsSortOrderList { get; set; }
-    }
+//        /// <summary>
+//        /// 鍒嗘嫞淇℃伅
+//        /// </summary>
+//        public List<WmsSortOrder> WmsSortOrderList { get; set; }
+//    }
 
-    /// <summary>
-    /// 鍒嗛〉鑾峰彇鍒嗘嫞鍗�
-    /// </summary>
-    public class SortPdaPageOutput : PageInputBase
-    {
-        /// <summary>
-        /// 鍗曟嵁澶х被
-        /// </summary>
-        public long OrderLargeCategory { get; set; }
+//    /// <summary>
+//    /// 鍒嗛〉鑾峰彇鍒嗘嫞鍗�
+//    /// </summary>
+//    public class SortPdaPageOutput : PageInputBase
+//    {
+//        /// <summary>
+//        /// 鍗曟嵁澶х被
+//        /// </summary>
+//        public long OrderLargeCategory { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁灏忕被
-        /// </summary>
-        public long OrderSubclass { get; set; }
+//        /// <summary>
+//        /// 鍗曟嵁灏忕被
+//        /// </summary>
+//        public long OrderSubclass { get; set; }
 
-        /// <summary>
-        /// 浜嬪姟绫诲瀷
-        /// </summary>
-        public string MoveType { get; set; }
+//        /// <summary>
+//        /// 浜嬪姟绫诲瀷
+//        /// </summary>
+//        public string MoveType { get; set; }
 
-        /// <summary>
-        /// 涓婁綅绯荤粺鍗曟嵁鍞竴璇嗗埆鐮�
-        /// </summary>
-        public long SOID { get; set; }
+//        /// <summary>
+//        /// 涓婁綅绯荤粺鍗曟嵁鍞竴璇嗗埆鐮�
+//        /// </summary>
+//        public long SOID { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁缂栧彿
-        /// </summary>
-        public string NO { get; set; }
+//        /// <summary>
+//        /// 鍗曟嵁缂栧彿
+//        /// </summary>
+//        public string NO { get; set; }
 
-        /// <summary>
-        /// 棰嗘枡鍗曠敵璇锋棩鏈�
-        /// </summary>
-        public DateTimeOffset Billdate { get; set; }
+//        /// <summary>
+//        /// 棰嗘枡鍗曠敵璇锋棩鏈�
+//        /// </summary>
+//        public DateTimeOffset Billdate { get; set; }
 
-        /// <summary>
-        /// 棰嗙敤椤圭洰鍙�
-        /// </summary>
-        public string WBSElementcode { get; set; }
+//        /// <summary>
+//        /// 棰嗙敤椤圭洰鍙�
+//        /// </summary>
+//        public string WBSElementcode { get; set; }
 
-        /// <summary>
-        /// 棰嗘枡閮ㄩ棬
-        /// </summary>
-        public string BenefitingDepartcode { get; set; }
+//        /// <summary>
+//        /// 棰嗘枡閮ㄩ棬
+//        /// </summary>
+//        public string BenefitingDepartcode { get; set; }
 
-        /// <summary>
-        /// 鍙楃泭閮ㄩ棬
-        /// </summary>
-        public string CostCenterID { get; set; }
+//        /// <summary>
+//        /// 鍙楃泭閮ㄩ棬
+//        /// </summary>
+//        public string CostCenterID { get; set; }
 
-        /// <summary>
-        /// 瀹㈡埛
-        /// </summary>
-        public string FI_Client_Analysis_H { get; set; }
+//        /// <summary>
+//        /// 瀹㈡埛
+//        /// </summary>
+//        public string FI_Client_Analysis_H { get; set; }
 
-        /// <summary>
-        /// 鏄惁鍏徃闂翠氦鏄�
-        /// </summary>
-        public long IsInnerCompany { get; set; }
+//        /// <summary>
+//        /// 鏄惁鍏徃闂翠氦鏄�
+//        /// </summary>
+//        public long IsInnerCompany { get; set; }
 
-        /// <summary>
-        /// 棰嗘枡浜�
-        /// </summary>
-        public string PickerID { get; set; }
+//        /// <summary>
+//        /// 棰嗘枡浜�
+//        /// </summary>
+//        public string PickerID { get; set; }
 
-        /// <summary>
-        /// 浠撳偍涓績
-        /// </summary>
-        public string WarehouseCentername { get; set; }
+//        /// <summary>
+//        /// 浠撳偍涓績
+//        /// </summary>
+//        public string WarehouseCentername { get; set; }
 
-        /// <summary>
-        /// 鍏徃
-        /// </summary>
-        public string Companyname { get; set; }
+//        /// <summary>
+//        /// 鍏徃
+//        /// </summary>
+//        public string Companyname { get; set; }
 
-        /// <summary>
-        /// 鏂藉伐闃�
-        /// </summary>
-        public string ConstructionTeamID { get; set; }
+//        /// <summary>
+//        /// 鏂藉伐闃�
+//        /// </summary>
+//        public string ConstructionTeamID { get; set; }
 
-        /// <summary>
-        /// 鍗曟嵁鐘舵��
-        /// </summary>
-        public Admin.NET.Core.OrderStatusEnum OrderStatus { get; set; }
+//        /// <summary>
+//        /// 鍗曟嵁鐘舵��
+//        /// </summary>
+//        public Admin.NET.Core.OrderStatusEnum OrderStatus { get; set; }
 
-        /// <summary>
-        /// Id涓婚敭
-        /// </summary>
-        public long Id { get; set; }
+//        /// <summary>
+//        /// Id涓婚敭
+//        /// </summary>
+//        public long Id { get; set; }
 
-        /// <summary>
-        /// 鏃堕棿
-        /// </summary>
-        public DateTimeOffset? CreatedTime { get; set; }
-    }
+//        /// <summary>
+//        /// 鏃堕棿
+//        /// </summary>
+//        public DateTimeOffset? CreatedTime { get; set; }
+//    }
 
-    /// <summary>
-    /// 鏍规嵁鍑哄簱鍗曡幏鍙栧垎鎷ｅ崟
-    /// </summary>
-    public class SortPdaDetailPageOutput
-    {
-        /// <summary>
-        /// 鏉ユ簮鍗曞彿
-        /// </summary>
-        public string OrderNo { get; set; }
+//    /// <summary>
+//    /// 鏍规嵁鍑哄簱鍗曡幏鍙栧垎鎷ｅ崟
+//    /// </summary>
+//    public class SortPdaDetailPageOutput
+//    {
+//        /// <summary>
+//        /// 鏉ユ簮鍗曞彿
+//        /// </summary>
+//        public string OrderNo { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡缂栧彿
-        /// </summary>
-        public string Materialcode { get; set; }
+//        /// <summary>
+//        /// 鐗╂枡缂栧彿
+//        /// </summary>
+//        public string Materialcode { get; set; }
 
-        /// <summary>
-        /// 鐗╂枡鍚嶇О
-        /// </summary>
-        public string Materialname { get; set; }
+//        /// <summary>
+//        /// 鐗╂枡鍚嶇О
+//        /// </summary>
+//        public string Materialname { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public long OrderDetailID { get; set; }
+//        /// <summary>
+//        /// 
+//        /// </summary>
+//        public long OrderDetailID { get; set; }
 
-        /// <summary>
-        /// 鍒嗘嫞缁勭洏鍗曞彿
-        /// </summary>
-        public string ContainerOrderNo { get; set; }
+//        /// <summary>
+//        /// 鍒嗘嫞缁勭洏鍗曞彿
+//        /// </summary>
+//        public string ContainerOrderNo { get; set; }
 
-        /// <summary>
-        /// 椤圭洰缂栧彿
-        /// </summary>
-        public string ProjectCode { get; set; }
+//        /// <summary>
+//        /// 椤圭洰缂栧彿
+//        /// </summary>
+//        public string ProjectCode { get; set; }
 
-        /// <summary>
-        /// TA鍙�
-        /// </summary>
-        public string TACode { get; set; }
+//        /// <summary>
+//        /// TA鍙�
+//        /// </summary>
+//        public string TACode { get; set; }
 
-        /// <summary>
-        /// 鍒嗘鍙�
-        /// </summary>
-        public string PartCode { get; set; }
+//        /// <summary>
+//        /// 鍒嗘鍙�
+//        /// </summary>
+//        public string PartCode { get; set; }
 
-        /// <summary>
-        /// 搴撲綅缂栫爜
-        /// </summary>
-        public string PlaceCode { get; set; }
+//        /// <summary>
+//        /// 搴撲綅缂栫爜
+//        /// </summary>
+//        public string PlaceCode { get; set; }
 
-        /// <summary>
-        /// 瀹瑰櫒缂栧彿
-        /// </summary>
-        public string ContainerCode { get; set; }
+//        /// <summary>
+//        /// 瀹瑰櫒缂栧彿
+//        /// </summary>
+//        public string ContainerCode { get; set; }
 
-        /// <summary>
-        /// 鍒嗘嫞鏁�
-        /// </summary>
-        public decimal SortQuantity { get; set; }
+//        /// <summary>
+//        /// 鍒嗘嫞鏁�
+//        /// </summary>
+//        public decimal SortQuantity { get; set; }
 
-        /// <summary>
-        /// 瀹為檯鍒嗘嫞鏁�
-        /// </summary>
-        public decimal ActualQuantity { get; set; }
+//        /// <summary>
+//        /// 瀹為檯鍒嗘嫞鏁�
+//        /// </summary>
+//        public decimal ActualQuantity { get; set; }
 
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public string Remarks { get; set; }
+//        /// <summary>
+//        /// 澶囨敞
+//        /// </summary>
+//        public string Remarks { get; set; }
 
-        /// <summary>
-        /// 鐘舵��-鏈垎鎷1銆佸垎鎷ｅ畬鎴恄2
-        /// </summary>
-        public Admin.NET.Core.SortStatusEnum SortStatus { get; set; }
+//        /// <summary>
+//        /// 鐘舵��-鏈垎鎷1銆佸垎鎷ｅ畬鎴恄2
+//        /// </summary>
+//        public Admin.NET.Core.SortStatusEnum SortStatus { get; set; }
 
-        /// <summary>
-        /// Id涓婚敭
-        /// </summary>
-        public long Id { get; set; }
-    }
-}
+//        /// <summary>
+//        /// Id涓婚敭
+//        /// </summary>
+//        public long Id { get; set; }
+//    }
+//}

--
Gitblit v1.9.3