Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

# Conflicts:
#	MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

.gitignore

@@ -227,3 +227,10 @@ MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.
 /MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.dll
 /MicroServices/Business/Business.Core/bin/Debug/net6.0
 /MicroServices/Business/Business.CoreTest/obj
+MicroServices/Business/Business.Application.Contracts/Properties/launchSettings.json
+MicroServices/Business/Business.HttpApi.Client/bin/Release/net6.0/Business.Application.Contracts.dll
+MicroServices/Business/Business.HttpApi.Client/bin/Release/net6.0/Business.Application.Contracts.pdb
+MicroServices/Business/Business.HttpApi.Client/bin/Release/net6.0/Business.HttpApi.Client.deps.json
+MicroServices/Business/Business.HttpApi.Client/bin/Release/net6.0/Business.HttpApi.Client.dll
+MicroServices/Business/Business.HttpApi.Client/bin/Release/net6.0/Business.HttpApi.Client.pdb
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.BuildWithSkipAnalyzers

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/BomChildExamineDto.cs

@@ -37,7 +37,7 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 序号
         /// </summary>
-        public int num { get; set; }
+        public string num { get; set; }
 
         /// <summary>
         /// 物料id
@@ -72,7 +72,12 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 物料属性
         /// </summary>
-        public string erp_cls { get; set; }
+        public int erp_cls { get; set; }
+
+        /// <summary>
+        /// 物料属性名称
+        /// </summary>
+        public string erp_cls_name { get; set; }
 
         /// <summary>
         /// 是否倒冲

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -22,6 +22,7 @@ using Business.BookManagement.Dto;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Application.Services;
 using ZstdSharp.Unsafe;
+using System.Transactions;
 
 namespace Business.ResourceExamineManagement
 {
@@ -66,16 +67,22 @@ namespace Business.ResourceExamineManagement
         /// 物料详情
         /// </summary>
         private readonly IMongoDB<ic_item> _ic_item;
-
+        private IRepository<ic_item, long> _mysql_ic_item;
         /// <summary>
         /// 物料BOM
         /// </summary>
         private readonly IMongoDB<ic_bom> _ic_bom;
-
+        private IRepository<ic_bom, long> _mysql_ic_bom;
         /// <summary>
         /// 物料BOM明细
         /// </summary>
         private readonly IMongoDB<ic_bom_child> _ic_bom_child;
+        /// <summary>
+        /// 生产工单主表
+        /// </summary>
+        private readonly IMongoDB<mes_morder> _mes_morder;
+        private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
+
         #endregion
 
         /// <summary>
@@ -86,14 +93,22 @@ namespace Business.ResourceExamineManagement
         public ResourceExamineAppService(
             IMongoDB<mes_technique> mes_technique,
             IMongoDB<ic_item> ic_item,
+            IRepository<ic_item, long> mysql_ic_item,
+            IRepository<ic_bom, long> mysql_ic_bom,
+            IRepository<ic_bom_child, long> mysql_ic_bom_child,
             IMongoDB<ic_bom> ic_bom,
-            IMongoDB<ic_bom_child> ic_bom_child
+            IMongoDB<ic_bom_child> ic_bom_child,
+            IMongoDB<mes_morder> mes_morder
             )
         {
             _mes_technique = mes_technique;
             _ic_item = ic_item;
+            _mysql_ic_item = mysql_ic_item;
             _ic_bom = ic_bom;
+            _mysql_ic_bom = mysql_ic_bom;
             _ic_bom_child = ic_bom_child;
+            _mysql_ic_bom_child = mysql_ic_bom_child;
+            _mes_morder = mes_morder;
         }
 
         /// <summary>
@@ -152,12 +167,13 @@ namespace Business.ResourceExamineManagement
                 //TODO：入参异常；
                 //throw new NotImplementedException();
             }
+            //var morderList = _mes_morder.(a => a.Id == ObjectId.Parse(id)).ToList().FirstOrDefault();
             //查询生产工单类型为计划工单并且工单类型为备库工单 并且BOM编码一致数据
             // 订单状态为 初始或下达工单
             // List =>数量满足Quantity && 生成工单结束日期最早
         }
 
-        public async Task BomPretreatmentAsync(long? orderid, long? BomId, int Quantity)
+        public void BomPretreatment(long? orderid, long? BomId, int Quantity)
         {
             if (orderid == null)
             {
@@ -169,47 +185,71 @@ namespace Business.ResourceExamineManagement
             }
 
             //var query = (await _ic_bom.GetQueryableAsync()).WhereIf(true, a => a.bom_id == BomId).ToList();
-            //var help = new SnowFlake();
-            //var id = help.NextId();
-            var level = 0;
+            var help = new SnowFlake();
             var bomlist = _ic_bom.GetAll();
             var bomchildlist = _ic_bom_child.GetAll();
             var icitemlist = _ic_item.GetAll();
-            //GetBomListAsync();
+            List<BomChildExamineDto> returnlist = new List<BomChildExamineDto>();
+            var dto = new BomChildExamineDto();
+            dto.bom_id = BomId.Value;
+            dto.level = 1;
+            dto.id = help.NextId();
+            dto.parent_id = help.NextId();
+            dto.qty = 1;
+            dto.num = "1";
+            dto.isbom = 1;
+            GetBomList(bomlist, bomchildlist, icitemlist, dto, returnlist);
         }
 
 
-        public void GetBomList(List<ic_bom> bomlist, List<ic_bom_child> bomchildlist, List<ic_item> icitemlist, long bomId, List<BomChildExamineDto> returnlist, long? parent_id, int le)
+        public void GetBomList(List<ic_bom> bomlist, List<ic_bom_child> bomchildlist, List<ic_item> icitemlist, BomChildExamineDto dto, List<BomChildExamineDto> returnlist)
         {
-            int level = le++;//初始化定义level层级
+            int level = dto.level++;//初始化定义level层级
             var help = new SnowFlake();
 
-            var bom = bomlist.WhereIf(true, s => s.bom_id == bomId).FirstOrDefault();
-            if (bom == null)
+            var bom = bomlist.WhereIf(true, s => s.Id == dto.bom_id).FirstOrDefault();
+            var item = icitemlist.WhereIf(true, a => a.Id == bom.icitem_id).FirstOrDefault();
+            if (bom == null || item==null)
             {
 
             }
-            var dto = new BomChildExamineDto();
-            dto.level = level;
-            dto.bom_id = bomId;
-            dto.id = help.NextId();
-            dto.parent_id = parent_id;
+            //var dto = new BomChildExamineDto();
+            //dto.level = level;
+            //dto.bom_id = bomId;
+            //dto.id = help.NextId();
+            //dto.parent_id = parent_id;
             dto.item_id = bom.icitem_id;
             dto.item_name = bom.item_name;
             dto.item_code = bom.item_number;
+            dto.model = item.model;
+            dto.unit = bom.unit;
+            dto.erp_cls = item.erp_cls;
+            dto.erp_cls_name = item.erp_cls_name;
+
             //var bdto = ObjectMapper.Map<ic_bom,BomChildExamineDto>(bom);
             returnlist.Add(dto);
-            var childlist = bomchildlist.WhereIf(true, a => a.bom_id == bom.bom_id).ToList();
+            var childlist = bomchildlist.WhereIf(true, a => a.bom_id == bom.Id).ToList();
+
+            int idx = 1;
             foreach (var c in childlist)
             {
-                var icitem = icitemlist.WhereIf(true, a => a.icitem_id == c.icitem_id).FirstOrDefault();
+                string childNum = dto.num + "." + idx.ToString();
+                var icitem = icitemlist.WhereIf(true, a => a.Id == c.icitem_id).FirstOrDefault();
                 //如果此明细查的到BOM信息，则代表此child是一个子BOM。
                 if (c.is_bom == 1)
                 {
                     var childBom = bomlist.WhereIf(true, a => a.icitem_id == c.icitem_id).FirstOrDefault();
                     if (childBom != null)
                     {
-                        GetBomList(bomlist, bomchildlist, icitemlist, childBom.bom_id, returnlist, dto.id, level);
+                        var cdto = new BomChildExamineDto();
+                        cdto.id = help.NextId();
+                        cdto.level = level;
+                        cdto.parent_id = dto.id;
+                        cdto.qty = c.qty.Value;
+                        cdto.backflush = c.backflush;
+                        cdto.num = childNum;
+                        cdto.isbom = 1;
+                        GetBomList(bomlist, bomchildlist, icitemlist, cdto, returnlist);
                     }
                 }
                 else
@@ -218,15 +258,24 @@ namespace Business.ResourceExamineManagement
                     {
                         var childDto = new BomChildExamineDto();
                         childDto.level = level++;
-                        childDto.bom_id = bomId;
+                        childDto.bom_id = dto.bom_id;
                         childDto.id = help.NextId();
-                        childDto.parent_id = parent_id;
-                        childDto.item_id = icitem.icitem_id;
+                        childDto.parent_id = dto.id;
+                        childDto.item_id = icitem.Id;
                         childDto.item_name = icitem.name;
                         childDto.item_code = icitem.number;
+                        childDto.num = childNum;
+                        childDto.model = icitem.model;
+                        childDto.unit = c.unit;
+                        childDto.erp_cls = item.erp_cls;
+                        childDto.erp_cls_name = item.erp_cls_name;
+                        childDto.backflush = c.backflush;
+                        childDto.qty = c.qty.Value;
+                        childDto.isbom = 0;
                         returnlist.Add(childDto);
                     }
                 }
+                idx++;
             }
 
         }

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -13,7 +13,7 @@ using Business.Core.Utilities;
 
 namespace Business.Model
 {
-    public abstract class BaseEntity: Entity<long>,ISoftDelete
+    public abstract class BaseEntity : Entity<long>, ISoftDelete
     {
         /// <summary>
         /// 生成新的Id

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -19,12 +19,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_bom : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long bom_id { get; set; }
-        /// <summary>
         /// bom单编号
         /// </summary>
         [StringLength(20)]

MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -13,12 +13,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_bom_child : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long bom_child_id { get; set; }
-        /// <summary>
         /// bom主键
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_factory_details : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long icitem_dtl_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs

@@ -13,12 +13,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_item : BaseEntity
     {
         /// <summary>
-        /// 物料id
-        /// </summary>
-        [Key]
-        [Description("物料id")]
-        public long icitem_id { get; set; }
-        /// <summary>
         /// 物料编码
         /// </summary>
         [StringLength(80)]
@@ -75,9 +69,13 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料属性
         /// </summary>
-        [StringLength(80)]
         [Description("物料属性")]
-        public string? erp_cls { get; set; }
+        public int erp_cls { get; set; }
+        /// <summary>
+        /// 物料属性名称
+        /// </summary>
+        [Description("物料属性")]
+        public string? erp_cls_name { get; set; }
         /// <summary>
         /// 物料等级
         /// </summary>

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_ie.cs

@@ -15,12 +15,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_item_ie:BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long ic_item_ie_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_item_inventory:BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long icitem_inventory_id { get; set; }
-        /// <summary>
         /// 物料库存主键
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_pur.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_item_pur : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long icitem_pur_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_item_stock : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long icitem_stock_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs

@@ -15,12 +15,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_metering_unit : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long ic_metering_unit_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_plan : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long ic_plan_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute.cs

@@ -16,12 +16,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_substitute : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long substitute_id { get; set; }
-        /// <summary>
         /// 群组代码
         /// </summary>
         [StringLength(20)]

MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all.cs

@@ -15,12 +15,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_substitute_all : BaseEntity
     {
         /// <summary>
-        /// 替代群组主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long substitute_allid { get; set; }
-        /// <summary>
         /// 群组主键
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/MES/IC/ic_substitute_all_dtl.cs

@@ -16,12 +16,6 @@ namespace Bussiness.Model.MES.IC
     public class ic_substitute_all_dtl : BaseEntity
     {
         /// <summary>
-        /// 明细主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long substitute_dtlid { get; set; }
-        /// <summary>
         /// 替代多群组主键
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -69,7 +69,7 @@ namespace Bussiness.Model.Production
         /// 生产工单日期
         /// </summary>
         [Description("生产工单日期")]
-        public  DateTime? morder_date { get; set; }
+        public DateTime? morder_date { get; set; }
         /// <summary>
         /// 生产工单状态(订单状态:初始，下达，暂停、完成)
         /// </summary>
@@ -193,7 +193,9 @@ namespace Bussiness.Model.Production
         /// <summary>
         /// 单位
         /// </summary>
-       // public string unit { get; set; }
+        [StringLength(80)]
+        [Description("单位")]
+        public string? unit { get; set; }
         /// <summary>
         /// 工单进度
         /// </summary>
@@ -209,15 +211,21 @@ namespace Bussiness.Model.Production
         /// <summary>
         /// 工单生产数量(计划数量)
         /// </summary>
-       // public decimal? morder_production_number { get; set; }
+        [Precision(20, 8)]
+        [Description("工单生产数量(计划数量)")]
+        public decimal? morder_production_number { get; set; }
         /// <summary>
         /// 需求数量
         /// </summary>
-      //  public decimal? need_number { get; set; }
+        [Precision(20, 8)]
+        [Description("需求数量")]
+        public decimal? need_number { get; set; }
         /// <summary>
         /// 剩余可用数量
         /// </summary>
-      //  public decimal? remaining_number { get; set; }
+        [Precision(20, 8)]
+        [Description("剩余可用数量")]
+        public decimal? remaining_number { get; set; }
         /// <summary>
         /// 报工数量
         /// </summary>

MicroServices/Business/Bussiness.Model/SRM/srm_po_list.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.SRM
     public class srm_po_list : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long polist_id { get; set; }
-        /// <summary>
         /// po单id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/SRM/srm_po_main.cs

@@ -10,12 +10,6 @@ namespace Bussiness.Model.SRM
     /// </summary>
     public class srm_po_main : BaseEntity
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long po_Id { get; set; }
 
         /// <summary>
         /// PO单号

MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.SRM
     public class srm_po_occupy : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long pooccupy_id { get; set; }
-        /// <summary>
         /// 采购订单id
         /// </summary>
         [Required]

MicroServices/Business/Bussiness.Model/SRM/srm_pr_main.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.SRM
     public class srm_pr_main : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long pr_id { get; set; }
-        /// <summary>
         /// pr单号
         /// </summary>
         [StringLength(80)]

MicroServices/Business/Bussiness.Model/SRM/srm_purchase.cs

@@ -11,12 +11,6 @@ namespace Bussiness.Model.SRM
     public class srm_purchase : BaseEntity
     {
         /// <summary>
-        /// 主键
-        /// </summary>
-        [Key]
-        [Description("主键")]
-        public long ic_purchase_id { get; set; }
-        /// <summary>
         /// 物料id
         /// </summary>
         [Required]