From 6c7a356b784efde61e2babc17fa6e05047dcc5a7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 15 十月 2025 00:21:36 +0800
Subject: [PATCH] 添加数据库表及出入库单处理业务逻辑
---
新建文件夹/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt | 0
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrder.cs | 6
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_Inventory_Batch.cs | 120 +++++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs | 142 ++++++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs | 4
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs | 98 +++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs | 6
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs | 44 +++
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 9
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/WIDESEA_SquareCabinServices.csproj | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail.cs | 3
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs | 4
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 147 +++++++++--
新建文件夹/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs | 2
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs | 151 +++++++++++
16 files changed, 702 insertions(+), 38 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
index 47c387e..658392b 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
index 7cfbe87..5080c36 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Common/MaterielEnum/MaterielSourceTypeEnum.cs"
@@ -4,17 +4,17 @@
using System.Text;
using System.Threading.Tasks;
-namespace WIDESEA_Common.MaterielEnum
+namespace WIDESEA_Common
{
public enum MaterielSourceTypeEnum
{
/// <summary>
- /// 閲囪喘浠�
+ /// 澶т欢
/// </summary>
PurchasePart = 1,
/// <summary>
- /// 鑷埗浠�
+ /// 灏忎欢
/// </summary>
SelfMadePart = 2,
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
index 1963213..1e07578 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/OrderDto.cs"
@@ -106,7 +106,7 @@
public string goods_no { get; set; }
/// <summary>
- /// 鍏ュ簱鏁伴噺锛堥��璐т负璐熸暟锛�
+ /// 鍏ュ簱鏁伴噺锛堥��璐т负璐熸暟锛夛紱瀵逛簬WMS鏉ヨ閮戒负鍏ュ簱涓烘鏁�
/// </summary>
public decimal order_qty { get; set; }
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
index d47c6b7..88f5cf6 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
@@ -21,9 +21,9 @@
public int Id { get; set; }
/// <summary>
- /// 浠撳簱缂栧彿
+ /// 搴撴埧缂栧彿
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撴埧缂栧彿")]
public int WarehouseId { get; set; }
/// <summary>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
index 682c4fe..e7c7a15 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
@@ -13,9 +13,9 @@
/// <summary>
/// 鐗╂枡淇℃伅
/// </summary>
- [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
+ [SugarTable(nameof(Dt_MaterielInfo1), "鐗╂枡淇℃伅")]
[SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
- public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity
+ public class Dt_MaterielInfo1 : BaseEntity//, BaseWarehouseEntity
{
/// <summary>
/// 涓婚敭
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail.cs"
index 20ae0a6..4b2ba99 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrderDetail.cs"
@@ -19,6 +19,9 @@
public int OrderId { get; set; }
//鍖哄煙锛堣嚜宸卞缓绔嬫垨鑰呬粬浠洿鎺ョ粰鍑烘潵锛�
+ /// <summary>
+ /// 搴撳尯
+ /// </summary>
[SugarColumn(ColumnName = "Reservoirarea", IsNullable = true, Length = 50, ColumnDescription = "搴撳尯")]
public string Reservoirarea { get; set; }
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrder.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrder.cs"
index 045226b..03ad449 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrder.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrder.cs"
@@ -16,8 +16,10 @@
[SugarColumn(ColumnName = "Out_no", IsNullable = true, Length = 50, ColumnDescription = "鍑哄簱鍗曞彿")]
public string Out_no{ get; set; }
-
- [SugarColumn(ColumnName = "Out_type", IsNullable = true, Length = 3, ColumnDescription = "鍑哄簱鍗曠被鍨�1姝ｅ父锛�2鍑哄簱閫�璐�")]
+ /// <summary>
+ /// 鐩樼偣鍑哄簱鍦╓MS绯荤粺浜哄伐鍒涘缓
+ /// </summary>
+ [SugarColumn(ColumnName = "Out_type", IsNullable = true, Length = 3, ColumnDescription = "鍑哄簱鍗曠被鍨�1姝ｅ父锛�2鍑哄簱閫�璐э紝3鐩樼偣鍑哄簱")]
public string Out_type { get; set; }
[SugarColumn(ColumnName = "Client_no", IsNullable = true, Length = 50, ColumnDescription = "瀹㈡埛浠ｇ爜")]
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
index 6912a2e..0814c88 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_DeliveryOrderDetail.cs"
@@ -14,7 +14,7 @@
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [SugarColumn(ColumnName = "DeliveryOrderId", IsNullable = true, ColumnDescription = "鍏宠仈鍏ュ簱鍗旾D")]
+ [SugarColumn(ColumnName = "DeliveryOrderId", IsNullable = true, ColumnDescription = "鍏宠仈鍑哄簱鍗旾D")]
public int DeliveryOrderId { get; set; }
//鍖哄煙锛堣嚜宸卞缓绔嬫垨鑰呬粬浠洿鎺ョ粰鍑烘潵锛�
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs"
new file mode 100644
index 0000000..d341365
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs"
@@ -0,0 +1,151 @@
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ [SugarTable(nameof(Dt_InventoryInfo), "搴撳瓨璇︽儏")]
+ public class Dt_InventoryInfo : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鎵樼洏缂栧彿")]
+ [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 搴撴埧缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "搴撴埧缂栧彿")]
+ [ExporterHeader(DisplayName = "搴撴埧缂栧彿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撴埧缂栧彿")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ /// 璐т綅缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "璐т綅缂栧彿")]
+ [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璐т綅缂栧彿")]
+ public string LocationCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ /// </summary>
+ [ImporterHeader(Name = "搴撳瓨鐘舵��")]
+ [ExporterHeader(DisplayName = "搴撳瓨鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鐘舵��")]
+ public int StockStatus { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡缂栧彿")]
+ [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+ [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡瑙勬牸")]
+ [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [ImporterHeader(Name = "鎵规鍙�")]
+ [ExporterHeader(DisplayName = "鎵规鍙�")]
+ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 瀹為檯搴撳瓨鏁�
+ /// </summary>
+ [ImporterHeader(Name = "瀹為檯搴撳瓨鏁�")]
+ [ExporterHeader(DisplayName = "瀹為檯搴撳瓨鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "瀹為檯搴撳瓨鏁�")]
+ public float StockQuantity { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鏁�
+ /// </summary>
+ [ImporterHeader(Name = "鍑哄簱鏁�")]
+ [ExporterHeader(DisplayName = "鍑哄簱鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏁�", DefaultValue = "0")]
+ public float OutboundQuantity { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣鏁帮紱鐩樼偣鍚庡疄闄呮暟閲�
+ /// </summary>
+ [ImporterHeader(Name = "鐩樼偣鏁�")]
+ [ExporterHeader(DisplayName = "鐩樼偣鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐩樼偣鏁�", DefaultValue = "0")]
+ public float SupplyQuantity { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "鍏ュ簱鏃堕棿")]
+ [ExporterHeader(DisplayName = "鍏ュ簱鏃堕棿")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍏ュ簱鏃堕棿")]
+ public DateTime? InDate { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [ImporterHeader(Name = "鐢熶骇鏃ユ湡")]
+ [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
+ public string ProductionDate { get; set; }
+
+ /// <summary>
+ /// 淇濊川鏈�
+ /// </summary>
+ [ImporterHeader(Name = "淇濊川鏈�")]
+ [ExporterHeader(DisplayName = "淇濊川鏈�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "淇濊川鏈�")]
+ public int ShelfLife { get; set; }
+
+ /// <summary>
+ /// 鏈夋晥鏈熻嚦
+ /// </summary>
+ [ImporterHeader(Name = "鏈夋晥鏈熻嚦")]
+ [ExporterHeader(DisplayName = "鏈夋晥鏈熻嚦")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏈夋晥鏈熻嚦")]
+ public string ValidityPeriod { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [ImporterHeader(Name = "澶囨敞")]
+ [ExporterHeader(DisplayName = "澶囨敞")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_Inventory_Batch.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_Inventory_Batch.cs"
new file mode 100644
index 0000000..58b4659
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_Inventory_Batch.cs"
@@ -0,0 +1,120 @@
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ [SugarTable(nameof(Dt_Inventory_Batch), "搴撳瓨鎵规淇℃伅")]
+ public class Dt_Inventory_Batch : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡缂栧彿")]
+ [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+ [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡瑙勬牸")]
+ [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [ImporterHeader(Name = "鎵规鍙�")]
+ [ExporterHeader(DisplayName = "鎵规鍙�")]
+ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁帮紙鍚岀墿鏂欏悓鎵规鎬诲拰锛�
+ /// </summary>
+ [ImporterHeader(Name = "搴撳瓨鏁�")]
+ [ExporterHeader(DisplayName = "搴撳瓨鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏁�")]
+ public float StockQuantity { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱鏁帮紙鍚岀墿鏂欏悓鎵规鎬诲拰锛�
+ /// </summary>
+ [ImporterHeader(Name = "鍑哄簱鏁�")]
+ [ExporterHeader(DisplayName = "鍑哄簱鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏁�", DefaultValue = "0")]
+ public float OutboundQuantity { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣鏁帮紱鐩樼偣鍚庡疄闄呮暟閲忥紙鍚岀墿鏂欏悓鎵规鎬诲拰锛�
+ /// </summary>
+ [ImporterHeader(Name = "鐩樼偣鏁�")]
+ [ExporterHeader(DisplayName = "鐩樼偣鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐩樼偣鏁�", DefaultValue = "0")]
+ public float SupplyQuantity { get; set; }
+
+ /// <summary>
+ /// ERP瀹為檯搴撳瓨鏁�
+ /// </summary>
+ [ImporterHeader(Name = "ERP瀹為檯搴撳瓨鏁�")]
+ [ExporterHeader(DisplayName = "ERP瀹為檯搴撳瓨鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "ERP瀹為檯搴撳瓨鏁�")]
+ public float ERPStockQuantity { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨宸紓锛氬簱瀛樻暟涓嶦RP瀹為檯搴撳瓨鏁版槸鍚︾浉绛�
+ /// true锛氬樊寮傦紝false锛氭棤宸紓
+ /// </summary>
+ [ImporterHeader(Name = "搴撳瓨宸紓")]
+ [ExporterHeader(DisplayName = "搴撳瓨宸紓")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨宸紓")]
+ public bool Status { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [ImporterHeader(Name = "鐢熶骇鏃ユ湡")]
+ [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
+ public string ProductionDate { get; set; }
+
+ /// <summary>
+ /// 鏈夋晥鏈熻嚦
+ /// </summary>
+ [ImporterHeader(Name = "鏈夋晥鏈熻嚦")]
+ [ExporterHeader(DisplayName = "鏈夋晥鏈熻嚦")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏈夋晥鏈熻嚦")]
+ public string ValidityPeriod { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [ImporterHeader(Name = "澶囨敞")]
+ [ExporterHeader(DisplayName = "澶囨敞")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
new file mode 100644
index 0000000..2649e3c
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_MaterielInfo.cs"
@@ -0,0 +1,142 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ /// <summary>
+ /// 鐗╂枡淇℃伅
+ /// </summary>
+ [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
+ [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
+ public class Dt_MaterielInfo : BaseEntity//, BaseWarehouseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栧彿锛涘簱鎴跨紪鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠撳簱缂栧彿")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
+
+ /// <summary>
+ /// 鍝佸悕
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍝佸悕")]
+ public string item { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)锛涘叏閮ㄩ粯璁ゆ垚鍝�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍩烘湰鍒嗙被(1:鎴愬搧銆�2:鍗婃垚鍝併��3:鍘熸潗鏂欍��4:澶囦欢)")]
+ public MaterielTypeEnum MaterielType { get; set; } = MaterielTypeEnum.FinishProduct;
+
+ /// <summary>
+ /// 鐗╂枡灞炴�у垎绫�(1:澶т欢銆�2:灏忎欢)
+ /// 澶т欢鍙斁骞冲簱锛屽皬浠舵牴鎹珛搴撴渶浣庡簱瀛樻暟鍜岀瑙�(鏁ｈ揣)鍖哄垎鏄惁鍏ョ珛搴�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴�у垎绫�(1:澶т欢銆�2:灏忎欢)")]
+ public MaterielSourceTypeEnum MaterielSourceType { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍘傚
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// 鍩烘湰鍗曚綅(buyUnitId/StockUnitId)
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅(buyUnitId/StockUnitId)")]
+ public string MaterielUnit { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡闀垮害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
+ public float? MaterielLength { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瀹藉害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡瀹藉害")]
+ public float? MaterielWide { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡楂樺害
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡楂樺害")]
+ public float? MaterielHeight { get; set; }
+
+ /// <summary>
+ /// 绠辫
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绠辫")]
+ public decimal BoxQty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱鏈�浣庡簱瀛樻暟
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绔嬪簱鏈�浣庡簱瀛樻暟")]
+ public decimal MinQty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱涓氬姟搴撳瓨鏁�;鏍规嵁鍑哄叆搴撴暟閲忓彉鍖�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "绔嬪簱涓氬姟搴撳瓨鏁�")]
+ public decimal Business_qty { get; set; }
+
+ /// <summary>
+ /// 绔嬪簱鏈�楂樺簱瀛樻暟
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "绔嬪簱鏈�楂樺簱瀛樻暟")]
+ public float? MaxQty { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍨嬪彿
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍨嬪彿")]
+ public string MaterielModel { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)")]
+ public EnableEnum MaterielState { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
new file mode 100644
index 0000000..0538080
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs"
@@ -0,0 +1,98 @@
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.OtherEnum;
+using WIDESEA_Core.Attributes;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ /// <summary>
+ /// 浠诲姟淇℃伅
+ /// </summary>
+ [SugarTable(nameof(Dt_SupplyTask), "鐩樼偣浠诲姟淇℃伅"), SugarIndex("unique_task_taskNum", nameof(TaskNum), OrderByType.Asc, true)]
+ public class Dt_SupplyTask : BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int TaskId { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [ImporterHeader(Name = "浠诲姟鍙�")]
+ [ExporterHeader(DisplayName = "浠诲姟鍙�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�"), Sequence(nameof(SequenceEnum.SeqTaskNum), 100000000)]
+ public int TaskNum { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鎵樼洏缂栧彿")]
+ [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 搴撴埧缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撴埧缂栧彿")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
+ /// 璐т綅缂栧彿,绔嬪簱鐩樼偣浠诲姟鐨勮揣浣嶇紪鍙峰氨绛変簬绔嬪簱
+ /// </summary>
+ [ImporterHeader(Name = "璐т綅缂栧彿")]
+ [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 30, ColumnDescription = "璐т綅缂栧彿")]
+ public string LocationCode { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁�
+ /// </summary>
+ [ImporterHeader(Name = "搴撳瓨鏁�")]
+ [ExporterHeader(DisplayName = "搴撳瓨鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏁�")]
+ public float StockQuantity { get; set; }
+
+ /// <summary>
+ /// 鐩樼偣鏁帮紱鐩樼偣鍚庡疄闄呮暟閲�
+ /// </summary>
+ [ImporterHeader(Name = "鐩樼偣鏁�")]
+ [ExporterHeader(DisplayName = "鐩樼偣鏁�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐩樼偣鏁�", DefaultValue = "0")]
+ public float SupplyQuantity { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鍗曟嵁缂栧彿")]
+ [ExporterHeader(DisplayName = "鍗曟嵁缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
+ public string? OrderNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟涓嬪彂鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "浠诲姟涓嬪彂鏃堕棿")]
+ [ExporterHeader(DisplayName = "浠诲姟涓嬪彂鏃堕棿")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")]
+ public DateTime? Dispatchertime { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [ImporterHeader(Name = "澶囨敞")]
+ [ExporterHeader(DisplayName = "澶囨敞")]
+ [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs"
new file mode 100644
index 0000000..3356d42
--- /dev/null
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs"
@@ -0,0 +1,44 @@
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.OtherEnum;
+using WIDESEA_Core.Attributes;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models
+{
+ /// <summary>
+ /// 浠诲姟淇℃伅鍘嗗彶
+ /// </summary>
+ [SugarTable(nameof(Dt_SupplyTask_Hty), "浠诲姟淇℃伅鍘嗗彶")]
+ public class Dt_SupplyTask_Hty : Dt_SupplyTask, IBaseHistoryEntity
+ {
+ /// <summary>
+ /// 鍘熻〃涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "鍘熻〃涓婚敭")]
+ [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
+ [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
+ public int SourceId { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
+ public string OperateType { get; set; }
+
+ /// <summary>
+ /// 绉诲叆鍘嗗彶鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
+ [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
+ public DateTime InsertTime { get; set; }
+ }
+}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index d4560c4..8a1872f 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -7,11 +7,12 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
-
+using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
using WIDESEA_Model.Models;
@@ -24,11 +25,13 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
-
- static string SearchDate = "";
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal) : base(BaseDal)
+ static string SearchDate = "";
+ private readonly IBasicService _basicService;
+
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService) : base(BaseDal)
{
+ _basicService = basicService;
}
/// <summary>
@@ -195,28 +198,118 @@
Supplier_no = order.supplier_no,
Account_tiem = order.account_time,
OdrderStatus = "鏂板缓",
- Supplier_name=order.supplier_name,
+ Supplier_name = order.supplier_name,
Warehouse_no = order.warehouse_no,
- Details = order.details.Select(d => new Dt_CabinOrderDetail
- {
- //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
- // SqlSugar InsertNav宸ヤ綔鍘熺悊鍏堟彃鍏ヤ富琛� (Dt_CabinOrder)//鑾峰彇鐢熸垚鐨勪富閿甀D//鑷姩璁剧疆瀛愯〃鐨勫叧鑱斿瓧娈� (OrderId)//鍐嶆彃鍏�(Dt_CabinOrderDetail)
- Goods_no = d.goods_no,
- Order_qty = d.order_qty,
- Batch_num = d.batch_num,
- Exp_date = d.exp_date,
- OrderDetailStatus="鏂板缓",
- Status = order.warehouse_no== "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
- }).ToList()
+ Details = new List<Dt_CabinOrderDetail>()
+ //Details = order.details.Select(d => new Dt_CabinOrderDetail
+ //{
+ // //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
+ // // SqlSugar InsertNav宸ヤ綔鍘熺悊鍏堟彃鍏ヤ富琛� (Dt_CabinOrder)//鑾峰彇鐢熸垚鐨勪富閿甀D//鑷姩璁剧疆瀛愯〃鐨勫叧鑱斿瓧娈� (OrderId)//鍐嶆彃鍏�(Dt_CabinOrderDetail)
+ // Goods_no = d.goods_no,
+ // Order_qty = d.order_qty,
+ // Batch_num = d.batch_num,
+ // Exp_date = d.exp_date,
+ // OrderDetailStatus = "鏂板缓",
+ // Status = order.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
+ //}).ToList()
};
+ foreach (var item in order.details)
+ {
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
+ {
+ Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
+ {
+ Reservoirarea= order.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = item.order_qty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty;
+ var xs = item.order_qty / materielInfo.BoxQty;
+ #region 鐢熸垚绔嬪簱鍏ュ簱鍗�
+
+ #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ if (ys > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Goods_no = item.goods_no,
+ Order_qty = ys,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ materielInfo.Business_qty += ys;
+ }
+ #endregion
+
+ #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
+ while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
+ {
+ xs--;
+ if (orderDetail == null)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+ else
+ {
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+ }
+ #endregion
+
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
+ #endregion
+
+ #region 鍓╀綑鏁翠欢鍏ュ钩搴�
+ if (xs > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty * xs,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
+ }
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ #endregion
+ }
_CabinOrders.Add(entityOrder);
orderNos.Add(order.order_no);
};
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
- //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
+ //var reslut= EdiIn(); //鍙戠粰涓嬫父
+ //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
}
@@ -264,7 +357,7 @@
Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
}
-
+
// 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
foreach (var order in orders)
@@ -333,10 +426,10 @@
if (resp != null && resp.code == "0")
{
// 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_CabinOrder>()
- .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
+ BaseDal.Db.Updateable<Dt_CabinOrder>()
+ .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
+ .Where(o => o.Id == order.Id)
+ .ExecuteCommand();
// 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
@@ -357,7 +450,7 @@
}
catch (Exception ex)
{
-
+
Console.WriteLine("EdiIn 寮傚父锛�" + ex.Message);
return new WebResponseContent { Status = false, Message = ex.Message };
}
@@ -444,7 +537,7 @@
Exp_date = d.Exp_date,
OrderDetailStatus = d.OrderDetailStatus,
Status = d.Status,
-
+
}).ToList();
BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
@@ -486,7 +579,7 @@
}
-
+
/// <summary>
@@ -518,7 +611,7 @@
-
+
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 4062e24..820ca9a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -186,6 +186,15 @@
Status = outorder.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝皢鐘舵�佽缃负0锛�2涓轰汉宸ュ鐞�
}).ToList()
};
+ #region 鏍规嵁鍑哄簱鍗曡鎯呮煡鎵剧墿鏂欏悕绉般�佹壒娆＄殑搴撳瓨淇℃伅(Dt_InventoryInfo)锛涙牴鎹厛鍏ュ厛鍑�,CreateDate
+ //鏍规嵁鐗╂枡鍚嶇О鏌ユ壘鐗╂枡淇℃伅
+
+ //鏍规嵁绠辫鍒ゆ柇鏄惁鏈夋暎浠讹紝璁＄畻鍑烘暎浠舵暟閲忓拰鏁翠欢鏁�
+
+ //鏍规嵁鍏ュ簱鏃堕棿鍒嗙粍锛屾湁鏁ｄ欢灏变紭鍏堝垎閰嶇珛搴撴暟閲忥紝鏁翠欢浼樺厛鍒嗛厤骞冲簱鏁伴噺
+
+
+ #endregion
_DeliveryOrders.Add(entityOrder);
//orderNos.Add(outorder.out_no);
};
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/WIDESEA_SquareCabinServices.csproj" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/WIDESEA_SquareCabinServices.csproj"
index d55254b..d3c4a86 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/WIDESEA_SquareCabinServices.csproj"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/WIDESEA_SquareCabinServices.csproj"
@@ -7,6 +7,8 @@
</PropertyGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEA_Common\WIDESEA_Common.csproj" />
+ <ProjectReference Include="..\WIDESEA_IBasicService\WIDESEA_IBasicService.csproj" />
<ProjectReference Include="..\WIDESEA_ISquareCabinServices\WIDESEA_ISquareCabinServices.csproj" />
<ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
</ItemGroup>
--
Gitblit v1.9.3