增加撤销与启动，详见：#I3ILBG

调整工程结构，采用模块化机制

OpenAuth.App/WmsInbound/Request/AddOrUpdateWmsInboundOrderDtblReq.cs

@@ -0,0 +1,95 @@
+//------------------------------------------------------------------------------
+// <autogenerated>
+//     This code was generated by a CodeSmith Template.
+//
+//     DO NOT MODIFY contents of this file. Changes to this
+//     file will be lost if the code is regenerated.
+//     Author:Yubao Li
+// </autogenerated>
+//------------------------------------------------------------------------------
+
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+	/// 入库通知单明细
+	/// </summary>
+    [Table("WmsInboundOrderDtbl")]
+    public partial class AddOrUpdateWmsInboundOrderDtblReq 
+    {
+
+        /// <summary>
+        /// 入库通知单明细号
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 入库通知单号
+        /// </summary>
+        public string OrderId { get; set; }
+        /// <summary>
+        /// 含税单价
+        /// </summary>
+        public decimal? Price { get; set; }
+        /// <summary>
+        /// 无税单价
+        /// </summary>
+        public decimal? PriceNoTax { get; set; }
+        /// <summary>
+        /// 是否收货中(0:非收货中,1:收货中)
+        /// </summary>
+        public bool InStockStatus { get; set; }
+        /// <summary>
+        /// 到货状况(SYS_GOODSARRIVESTATUS)
+        /// </summary>
+        public int AsnStatus { get; set; }
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public string GoodsId { get; set; }
+        /// <summary>
+        /// 商品批号
+        /// </summary>
+        public string GoodsBatch { get; set; }
+        /// <summary>
+        /// 品质(SYS_QUALITYFLAG)
+        /// </summary>
+        public string QualityFlg { get; set; }
+        /// <summary>
+        /// 通知数量
+        /// </summary>
+        public decimal OrderNum { get; set; }
+        /// <summary>
+        /// 到货数量
+        /// </summary>
+        public decimal InNum { get; set; }
+        /// <summary>
+        /// 剩余数量
+        /// </summary>
+        public decimal LeaveNum { get; set; }
+        /// <summary>
+        /// 占用数量
+        /// </summary>
+        public decimal HoldNum { get; set; }
+        /// <summary>
+        /// 生产日期
+        /// </summary>
+        public string ProdDate { get; set; }
+        /// <summary>
+        /// 失效日期
+        /// </summary>
+        public string ExpireDate { get; set; }
+        /// <summary>
+        /// 税率
+        /// </summary>
+        public decimal? TaxRate { get; set; }
+        /// <summary>
+        /// 货主编号
+        /// </summary>
+        public string OwnerId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}

OpenAuth.App/WmsInbound/Request/AddOrUpdateWmsInboundOrderTblReq.cs

@@ -0,0 +1,99 @@
+//------------------------------------------------------------------------------
+// <autogenerated>
+//     This code was generated by a CodeSmith Template.
+//
+//     DO NOT MODIFY contents of this file. Changes to this
+//     file will be lost if the code is regenerated.
+//     Author:Yubao Li
+// </autogenerated>
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+	/// 入库通知单（入库订单）
+	/// </summary>
+    [Table("WmsInboundOrderTbl")]
+    public partial class AddOrUpdateWmsInboundOrderTblReq 
+    {
+
+        /// <summary>
+        /// 入库通知单号
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 相关单据号
+        /// </summary>
+        public string ExternalNo { get; set; }
+        /// <summary>
+        /// 相关单据类型
+        /// </summary>
+        public string ExternalType { get; set; }
+        /// <summary>
+        /// 入库通知单状态(SYS_INSTCINFORMSTATUS)
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+        /// 入库类型(SYS_INSTCTYPE)
+        /// </summary>
+        public string OrderType { get; set; }
+        /// <summary>
+        /// 商品类别
+        /// </summary>
+        public string GoodsType { get; set; }
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string PurchaseNo { get; set; }
+        /// <summary>
+        /// 仓库编号
+        /// </summary>
+        public string StockId { get; set; }
+        /// <summary>
+        /// 货主编号(固定值CQM)
+        /// </summary>
+        public string OwnerId { get; set; }
+        /// <summary>
+        /// 承运人编号
+        /// </summary>
+        public string ShipperId { get; set; }
+        /// <summary>
+        /// 供应商编号
+        /// </summary>
+        public string SupplierId { get; set; }
+        /// <summary>
+        /// 预定入库时间
+        /// </summary>
+        public System.DateTime? ScheduledInboundTime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 有效标志
+        /// </summary>
+        public bool Enable { get; set; }
+        /// <summary>
+        /// 承运方式
+        /// </summary>
+        public string TransferType { get; set; }
+        /// <summary>
+        /// 是否入保税库(0:否,1:是)
+        /// </summary>
+        public bool InBondedArea { get; set; }
+        /// <summary>
+        /// 销退箱数
+        /// </summary>
+        public decimal ReturnBoxNum { get; set; }
+        
+        /// <summary>
+        /// 所属部门
+        /// </summary>
+        public string OrgId { get; set; }
+        
+        public List<AddOrUpdateWmsInboundOrderDtblReq> WmsInboundOrderDtblReqs { get; set; }
+    }
+}

OpenAuth.App/WmsInbound/Request/QueryWmsInboundOrderDtblListReq.cs

@@ -0,0 +1,11 @@
+namespace OpenAuth.App.Request
+{
+    public class QueryWmsInboundOrderDtblListReq : PageReq
+    {
+        //todo:添加自己的请求字段
+        /// <summary>
+        /// 入库订单号
+        /// </summary>
+        public string InboundOrderId { get; set; }
+    }
+}

OpenAuth.App/WmsInbound/Request/QueryWmsInboundOrderTblListReq.cs

@@ -0,0 +1,7 @@
+namespace OpenAuth.App.Request
+{
+    public class QueryWmsInboundOrderTblListReq : PageReq
+    {
+        //todo:添加自己的请求字段
+    }
+}

OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Infrastructure;
+using OpenAuth.App.Interface;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
+
+
+namespace OpenAuth.App
+{
+    public class WmsInboundOrderDtblApp : BaseStringApp<WmsInboundOrderDtbl,OpenAuthDBContext>
+    {
+        private RevelanceManagerApp _revelanceApp;
+        private DbExtension _dbExtension;
+
+        /// <summary>
+        /// 加载列表
+        /// </summary>
+        public async Task<TableData> Load(QueryWmsInboundOrderDtblListReq request)
+        {
+
+            var loginContext = _auth.GetCurrentUser();
+            if (loginContext == null)
+            {
+                throw new CommonException("登录已过期", Define.INVALID_TOKEN);
+            }
+            
+            //todo:普通账号如何分配明细的字段？？？？先写死😰
+
+            var properties = _dbExtension.GetProperties("WmsInboundOrderDtbl");
+            
+            var result = new TableData();
+            var objs = UnitWork.Find<WmsInboundOrderDtbl>(null);
+            if (!string.IsNullOrEmpty(request.InboundOrderId))
+            {
+                objs = objs.Where(u => u.OrderId == request.InboundOrderId);
+            }
+            
+            if (!string.IsNullOrEmpty(request.key))
+            {
+                objs = objs.Where(u => u.GoodsId.Contains(request.key));
+            }
+
+            var propertyStr = string.Join(',', properties.Select(u => u.Key));
+            result.columnHeaders = properties;
+            result.data = objs.OrderBy(u => u.Id)
+                .Skip((request.page - 1) * request.limit)
+                .Take(request.limit).Select($"new ({propertyStr})");
+            result.count = objs.Count();
+            return result;
+        }
+
+        public void Add(AddOrUpdateWmsInboundOrderDtblReq req)
+        {
+            AddNoSave(req);
+            UnitWork.Save();
+        }
+        
+        public void AddNoSave(AddOrUpdateWmsInboundOrderDtblReq req)
+        {
+            var obj = req.MapTo<WmsInboundOrderDtbl>();
+            //todo:补充或调整自己需要的字段
+            obj.CreateTime = DateTime.Now;
+            var user = _auth.GetCurrentUser().User;
+            obj.CreateUserId = user.Id;
+            obj.CreateUserName = user.Name;
+            UnitWork.Add(obj);
+        }
+
+         public void Update(AddOrUpdateWmsInboundOrderDtblReq obj)
+        {
+            var user = _auth.GetCurrentUser().User;
+            UnitWork.Update<WmsInboundOrderDtbl>(u => u.Id == obj.Id, u => new WmsInboundOrderDtbl
+            {
+                Price = obj.Price,
+                PriceNoTax = obj.PriceNoTax,
+                InStockStatus = obj.InStockStatus,
+                AsnStatus = obj.AsnStatus,
+                GoodsId = obj.GoodsId,
+                GoodsBatch = obj.GoodsBatch,
+                QualityFlg = obj.QualityFlg,
+                OrderNum = obj.OrderNum,
+                InNum = obj.InNum,
+                LeaveNum = obj.LeaveNum,
+                HoldNum = obj.HoldNum,
+                ProdDate = obj.ProdDate,
+                ExpireDate = obj.ExpireDate,
+                TaxRate = obj.TaxRate,
+                OwnerId = obj.OwnerId,
+                Remark = obj.Remark,
+                UpdateTime = DateTime.Now,
+                UpdateUserId = user.Id,
+                UpdateUserName = user.Name
+                //todo:补充或调整自己需要的字段
+            });
+
+        }
+
+        public WmsInboundOrderDtblApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<WmsInboundOrderDtbl,OpenAuthDBContext> repository,
+            RevelanceManagerApp app, IAuth auth, DbExtension dbExtension) : base(unitWork, repository,auth)
+        {
+            _dbExtension = dbExtension;
+            _revelanceApp = app;
+        }
+    }
+}

OpenAuth.App/WmsInbound/WmsInboundOrderTblApp.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Infrastructure;
+using OpenAuth.App.Interface;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
+
+
+namespace OpenAuth.App
+{
+    public class WmsInboundOrderTblApp : BaseStringApp<WmsInboundOrderTbl,OpenAuthDBContext>
+    {
+        private RevelanceManagerApp _revelanceApp;
+        private WmsInboundOrderDtblApp _wmsInboundOrderDtblApp;
+
+        /// <summary>
+        /// 加载列表
+        /// </summary>
+        public async Task<TableData> Load(QueryWmsInboundOrderTblListReq request)
+        {
+            var loginContext = _auth.GetCurrentUser();
+            if (loginContext == null)
+            {
+                throw new CommonException("登录已过期", Define.INVALID_TOKEN);
+            }
+
+            var properties = loginContext.GetProperties("WmsInboundOrderTbl");
+
+            if (properties == null || properties.Count == 0)
+            {
+                throw new Exception("当前登录用户没有访问该模块字段的权限，请联系管理员配置");
+            }
+
+
+            var result = new TableData();
+            var objs = GetDataPrivilege("u");
+            if (!string.IsNullOrEmpty(request.key))
+            {
+                objs = objs.Where(u => u.Id.Contains(request.key));
+            }
+
+            var propertyStr = string.Join(',', properties.Select(u => u.Key));
+            result.columnHeaders = properties;
+            result.data = objs.OrderBy(u => u.Id)
+                .Skip((request.page - 1) * request.limit)
+                .Take(request.limit).Select($"new ({propertyStr})");
+            result.count = objs.Count();
+            return result;
+        }
+
+        public void Add(AddOrUpdateWmsInboundOrderTblReq req)
+        {
+            var obj = req.MapTo<WmsInboundOrderTbl>();
+            //todo:补充或调整自己需要的字段
+            obj.CreateTime = DateTime.Now;
+            var user = _auth.GetCurrentUser().User;
+            obj.CreateUserId = user.Id;
+            obj.CreateUserName = user.Name;
+            UnitWork.Add(obj);
+            if (req.WmsInboundOrderDtblReqs != null && req.WmsInboundOrderDtblReqs.Any())
+            {
+                foreach (var detail in req.WmsInboundOrderDtblReqs)
+                {
+                    detail.OrderId = obj.Id;
+                    _wmsInboundOrderDtblApp.AddNoSave(detail);
+                }
+            }
+
+            UnitWork.Save();
+        }
+
+        public void Update(AddOrUpdateWmsInboundOrderTblReq obj)
+        {
+            var user = _auth.GetCurrentUser().User;
+
+            UnitWork.ExecuteWithTransaction(() =>
+            {
+                if (obj.WmsInboundOrderDtblReqs != null && obj.WmsInboundOrderDtblReqs.Any())
+                {
+                    //id为空的添加
+                    foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => string.IsNullOrEmpty(u.Id)))
+                    {
+                        detail.OrderId = obj.Id;
+                        _wmsInboundOrderDtblApp.AddNoSave(detail);
+                    }
+
+                    //id比数据库少的，删除
+                    var containids = obj.WmsInboundOrderDtblReqs.Select(u => u.Id)
+                        .Where(u => !string.IsNullOrEmpty(u)).ToList();
+                    if (containids.Any())
+                    {
+                        UnitWork.Delete<WmsInboundOrderDtbl>(u => (!containids.Contains(u.Id)) && u.OrderId == obj.Id);
+                    }
+
+                    //更新id相同的
+                    foreach (var detail in obj.WmsInboundOrderDtblReqs.Where(u => !string.IsNullOrEmpty(u.Id)))
+                    {
+                        _wmsInboundOrderDtblApp.Update(detail);
+                    }
+                }
+
+                UnitWork.Update<WmsInboundOrderTbl>(u => u.Id == obj.Id, u => new WmsInboundOrderTbl
+                {
+                    ExternalNo = obj.ExternalNo,
+                    ExternalType = obj.ExternalType,
+                    Status = obj.Status,
+                    OrderType = obj.OrderType,
+                    GoodsType = obj.GoodsType,
+                    PurchaseNo = obj.PurchaseNo,
+                    StockId = obj.StockId,
+                    OwnerId = obj.OwnerId,
+                    ShipperId = obj.ShipperId,
+                    SupplierId = obj.SupplierId,
+                    ScheduledInboundTime = obj.ScheduledInboundTime,
+                    Remark = obj.Remark,
+                    Enable = obj.Enable,
+                    TransferType = obj.TransferType,
+                    InBondedArea = obj.InBondedArea,
+                    ReturnBoxNum = obj.ReturnBoxNum,
+                    UpdateTime = DateTime.Now,
+                    UpdateUserId = user.Id,
+                    UpdateUserName = user.Name
+                    //todo:补充或调整自己需要的字段
+                });
+
+                UnitWork.Save();
+            });
+        }
+
+        public WmsInboundOrderTblApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<WmsInboundOrderTbl,OpenAuthDBContext> repository,
+            RevelanceManagerApp app, IAuth auth, WmsInboundOrderDtblApp wmsInboundOrderDtblApp) : base(unitWork,
+            repository, auth)
+        {
+            _revelanceApp = app;
+            _wmsInboundOrderDtblApp = wmsInboundOrderDtblApp;
+        }
+    }
+}