提交

Domain/Domain/TakeStock/TakeStockOrder.cs

@@ -9,6 +9,12 @@ namespace Domain.Domain.TakeStock
     [SugarTable("stock_takestockorder")]
     public class TakeStockOrder
     {
+        public TakeStockOrder()
+        {
+            this.Code = "TSO" + DateTime.Now.ToString("yyMMddHHmmssfff");
+            this.CreationTime = DateTime.Now;
+        }
+
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
         
@@ -47,6 +53,18 @@ namespace Domain.Domain.TakeStock
         public int? AfterQuantity { get; set; }
 
         /// <summary>
+        /// 等待完结的配货单号
+        /// </summary>
+        [SugarColumn(IsNullable = true, Length = 1000)]
+        public string WaitCodes { get; set; }
+
+        /// <summary>
+        /// 取消的配货单号
+        /// </summary>
+        [SugarColumn(IsNullable = true, Length = 1000)]
+        public string CancelCodes { get; set; }
+
+        /// <summary>
         /// 备注
         /// </summary>
         [SugarColumn(IsNullable = true, Length = 500)]
@@ -62,5 +80,13 @@ namespace Domain.Domain.TakeStock
 
         [SugarColumn(IsNullable = true)]
         public long? LastModifierUserId { get; set; }
+
+        public bool IsDeleted { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public long? DeleterUserId { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public DateTime? DeletionTime { get; set; }
     }
 }

Domain/Domain/TakeStock/TakeStockOrderLog.cs

@@ -9,6 +9,11 @@ namespace Domain.Domain.TakeStock
     [SugarTable("stock_takestockorder_log")]
     public class TakeStockOrderLog
     {
+        public TakeStockOrderLog()
+        {
+            this.CreationTime = DateTime.Now;
+        }
+
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 

Domain/Domain/TakeStock/TakeStockSchedule.cs

@@ -9,6 +9,12 @@ namespace Domain.Domain.TakeStock
     [SugarTable("stock_takestockschedule")]
     public class TakeStockSchedule
     {
+        public TakeStockSchedule()
+        {
+            this.Code = "TSS" + DateTime.Now.ToString("yyMMddHHmmssfff");
+            this.CreationTime = DateTime.Now;
+        }
+
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 

TakeStock.API/Controllers/TakeStockController.cs

@@ -44,9 +44,9 @@ namespace TakeStock.API.Controllers
         //}
 
         [HttpPost]
-        public async Task<bool> PostCheckRecord([FromBody] ScheduleInputDto record)
+        public async Task<bool> CreateTakeStockSchedule([FromBody] ScheduleInputDto record)
         {
-            var result = await takeStockAppService.CreateCheckRecord(record);
+            var result = await takeStockAppService.CreateTakeStockSchedule(record);
             return result;
         }
         

TakeStock.API/Startup.cs

@@ -96,7 +96,7 @@ namespace TakeStock.API
             app.UseHangfireDashboard("/hangfire", options);
 
             app.UseMvc();
-            dbContext.Migration();
+            //dbContext.Migration();
         }
 
         public void RegisterHttpClient(IServiceCollection services)

TakeStock.API/appsettings.json

@@ -15,7 +15,7 @@
   "ConnectionStrings": {
     "Localhost": "server=gz-cdb-hqmznu0w.sql.tencentcdb.com;port=63523;database=bailun_wms;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;Allow User Variables=true;",
     //"Redis": "127.0.0.1"
-    "Redis": "172.31.1.74" 
+    "Redis": "172.31.1.74"
   },
   "App": {
     "CorsOrigins": "*"

TakeStock.Application/TakeStock/Dto/OrderInputDto.cs

@@ -8,43 +8,15 @@ namespace TakeStock.Application.TakeStock.Dto
     public class OrderInputDto
     {
         /// <summary>
-        /// 盘点单号
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
         /// 仓库编码
         /// </summary>
         public string WarehouseCode { get; set; }
 
-        public TSOrderState State { get; set; }
-
         /// <summary>
         /// 产品sku
         /// </summary>
         public string Sku { get; set; }
-
-        /// <summary>
-        /// 盘点前数量
-        /// </summary>
-        public int? BeforeQuantity { get; set; }
-
-        /// <summary>
-        /// 盘点后数量
-        /// </summary>
-        public int? AfterQuantity { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Description { get; set; }
-
-        public DateTime CreationTime { get; set; }
-
-        public long? CreatorUserId { get; set; }
-
-        public DateTime? LastModificationTime { get; set; }
-
-        public long? LastModifierUserId { get; set; }
+        
+        public long? CreatorUserId { get; set; }        
     }
 }

TakeStock.Application/TakeStock/Dto/ScheduleInputDto.cs

@@ -8,11 +8,6 @@ namespace TakeStock.Application.TakeStock.Dto
     public class ScheduleInputDto
     {
         /// <summary>
-        /// 盘点单号
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
         /// 仓库编码
         /// </summary>
         public string WarehouseCode { get; set; }
@@ -28,29 +23,12 @@ namespace TakeStock.Application.TakeStock.Dto
         public bool IsAutomation { get; set; }
 
         /// <summary>
-        /// 状态
-        /// </summary>
-        public TSScheduleState State { get; set; }
-
-        /// <summary>
         /// 描述
         /// </summary>
         public string Description { get; set; }
 
-        public DateTime CreationTime { get; set; }
-
         public long? CreatorUserId { get; set; }
 
-        public DateTime? LastModificationTime { get; set; }
-
-        public long? LastModifierUserId { get; set; }
-
-        public bool IsDeleted { get; set; }
-
-        public long? DeleterUserId { get; set; }
-
-        public DateTime? DeletionTime { get; set; }
-
         public virtual List<OrderInputDto> Orders { get; set; }
     }
 }

TakeStock.Application/TakeStock/TakeStockAppService.cs

@@ -19,7 +19,7 @@ namespace TakeStock.Application.TakeStock
             this.takeStockService = takeStockService;
         }
 
-        public async Task<bool> CreateCheckRecord(ScheduleInputDto input)
+        public async Task<bool> CreateTakeStockSchedule(ScheduleInputDto input)
         {
             var str = JsonConvert.SerializeObject(input);
             TakeStockSchedule schedule = JsonConvert.DeserializeObject<TakeStockSchedule>(str);

TakeStock.SqlSugar/DbContext.cs

@@ -59,8 +59,8 @@ namespace SqlSugar
 
         public void Migration()
         {
-            //Db.CodeFirst.SetStringDefaultLength(20/*设置varchar默认长度为200*/)
-            //    .InitTables(typeof(TakeStockSchedule), typeof(TakeStockOrder), typeof(TakeStockOrderLog));//执行完数据库就有这个表了
+            Db.CodeFirst.SetStringDefaultLength(20/*设置varchar默认长度为200*/)
+                .InitTables(typeof(TakeStockSchedule), typeof(TakeStockOrder), typeof(TakeStockOrderLog));//执行完数据库就有这个表了
         }
     }
 }
\ No newline at end of file

TakeStock.SqlSugar/Repository.cs

 using Domain;
 using SqlSugar;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -241,5 +240,12 @@ namespace TakeStock.SqlSugar
             else
                 return client.Updateable(entity).ExecuteCommandAsync();
         }
+
+//        public void PageList(TEntity entity)
+//        {
+//            var pageJoin = client.Queryable<Student, School>((st, sc) => new object[] {
+//    JoinType.Left,st.SchoolId==sc.Id
+//}).ToPageList(pageIndex, pageSize, ref totalCount);
+//        }
     }
 }