林豪 左 1 year ago
parent
commit
1e3541e2a5
2 changed files with 40 additions and 35 deletions
  1. 5 2
      wms.service/Service/FJService.cs
  2. 35 33
      wms.sqlsugar/model/fj/BillDocsinfo.cs

+ 5 - 2
wms.service/Service/FJService.cs

@@ -85,6 +85,10 @@ namespace wms.service.Service
         private Repository<BillSpoolTrans> _billSpoolTransrepository => new Repository<BillSpoolTrans>();
 
         private Repository<BillBominfo> _billBominfoRepository => new Repository<BillBominfo>();
+
+        /// <summary>
+        ///  垛形信息
+        /// </summary>
         private Repository<BillBomsetinfo> _billBomsetinfoRepository => new Repository<BillBomsetinfo>();
 
         /// <summary>
@@ -729,6 +733,7 @@ namespace wms.service.Service
         /// <returns></returns>
         public SRes AllocationWarehouseSort(string code)
         {
+            //开始分配分拣库
             var res = new SRes();
             //找到码垛工字轮信息
             var spoolTrans = _billSpoolTransrepository.GetSingle(p => p.ConBarCode == code);
@@ -757,8 +762,6 @@ namespace wms.service.Service
             }
             else //当前订单对应多个仓库信息
             {
-                
-
                 //TODO:怎么计算当前订单在当前仓库需要码多少托,跟据当前仓库已有订单需要的托盘数量计算各订单在可用码垛工位占比,再计算当前托盘该码什么跺
 
                 var waretemplist = maclist.Select(p => new { p.WarehouseCode, p.WorkOrder, p.BillCode, p.PlanQty }).Distinct();

+ 35 - 33
wms.sqlsugar/model/fj/BillDocsinfo.cs

@@ -1,6 +1,4 @@
-using System; 
-using System.Collections.Generic;
-using SqlSugar;
+using SqlSugar;
 
 namespace wms.sqlsugar.model.fj
 {
@@ -9,62 +7,66 @@ namespace wms.sqlsugar.model.fj
     /// </summary>
     [Tenant("fj")]
     [SugarTable("Bill_DocsInfo")]
-    public partial class BillDocsinfo:BaseModel
-    { 
-        /// <summary> 
+    public partial class BillDocsinfo : BaseModel
+    {
+        /// <summary>
         /// IsStop
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="int" ,  IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int IsStop { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// WarehouseId
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="bigint" ,  IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
         public long WarehouseId { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// ReqNo
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="nvarchar" , Length = 50  , IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = false)]
         public string ReqNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         ///  单据编号
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="nvarchar" , Length = 50  , IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", Length = 50, IsNullable = false)]
         public string DocsNo { get; set; }
 
-        /// <summary> 
+        /// <summary>
         ///  类型编号
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="int" ,  IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int TypeNum { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// StateNum
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="int" ,  IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int StateNum { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// JsonContent
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="nvarchar" , IsNullable = true )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", IsNullable = true)]
         public string JsonContent { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// DownQty
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="int" ,  IsNullable = false )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "int", IsNullable = false)]
         public int DownQty { get; set; }
 
-        /// <summary> 
+        /// <summary>
         /// DownErrReason
-        /// </summary> 
-        [SugarColumn(ColumnDataType ="nvarchar" , Length = 500  , IsNullable = true )]
+        /// </summary>
+        [SugarColumn(ColumnDataType = "nvarchar", Length = 500, IsNullable = true)]
         public string DownErrReason { get; set; }
 
+        /// <summary>
+        /// 垛型id
+        /// </summary>
+        [SugarColumn(ColumnDataType = "bigint", IsNullable = false)]
+        public long BomSetHdrId { get; set; }
     }
 }
-