Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application.Contracts/Dto/ReplenishmentDto.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.Dto
+{
+    public class ReplenishmentDto
+    {
+        /// <summary>
+        /// 补货模型计算周期，M表示月，W表示周，D表示天
+        /// </summary>
+        public string ReplenishmentCalcPeriod { get; set; }
+
+        /// <summary>
+        /// 历史出库数据（月）：拟使用h月的历史数据参与补货模型的计算
+        /// </summary>
+        public int HistoryOutStockMonth { get; set; }
+
+        /// <summary>
+        /// 销售预测数据（月）：拟使用f月的销售预测数据参与补货模型的计算
+        /// </summary>
+        public int SaleFcstMonth { get; set; }
+
+        /// <summary>
+        /// 销售预测录入日期：拟每月的15 ~20日录入销售预测数据
+        /// </summary>
+        public int SaleFcstEntryDate { get; set; }
+
+        /// <summary>
+        /// 更新周数：wn, 每次计算时需要更新的周数，目前为12周，但只有4周（工厂内部）+4周（发给供应商）用于指导生产
+        /// </summary>
+        public int UpdateWeeks { get; set; }
+
+        /// <summary>
+        /// 周计划更新日期：每周四进行更新(是按照国际1表示周日2表示周一还是按照国内习惯1表示周一？)
+        /// </summary>
+        public int WeekPlanUpdateDay { get; set; }
+
+        /// <summary>
+        /// 长周期物料的定义：供应提前期大于D天，定义为长周期
+        /// 注：瑞贝目前是每周日更新 长周期物料需求计算：M+n月。瑞奇的采购周期可长达160天左右，需要6个月的提前计算。
+        /// 注：瑞贝有超过12个月的采购周期，在没有12个月的预测时，只能人工估算并手动下订单。
+        /// </summary>
+        public int LongPeriodDay { get; set; }        
+    }
+}

MicroServices/Business/Business.Application/DOP/SyncDOPAppService.cs

@@ -235,9 +235,11 @@ namespace Business.DOP
                 //产品线和系列
                 var itemProdRange = yearDemandList.Find(b => b.Model == a.Model);
                 if (itemProdRange != null)
+                {
                     a.ProLine = itemProdRange.ProdLine;
-                    a.Series= itemProdRange.ProdRange;
-
+                    a.Series = itemProdRange.ProdRange;
+                }
+     
                 //工厂库存
                 var itemSap = ItemInvList.Find(b => b.MATNR == a.ItemNumber);
                 if(itemSap!=null)

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -513,7 +513,7 @@ namespace Business.ResourceExamineManagement
         public string GetMaxSerialNumber(long id, JObject? formData = null)
         {
             var modelList = _rf_serialnumber.Select(s => s.Id == id);
-            if (modelList == null && modelList.Count < 1)
+            if (modelList == null || modelList.Count < 1)
             {
                 return string.Empty;
             }

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

@@ -2597,7 +2597,6 @@ namespace Business.ResourceExamineManagement
             var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && (s.Status == "" || s.Status == "r") && stime <= s.PlanDate && s.PlanDate <= etime).ToList();
             if (periodSd.Any())
             {
-                periodSd.Select(s => s.WorkOrds).ToList();
                 List<mes_morder> mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && periodSd.Select(s => s.WorkOrds).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
                 return await OrderResourceCheck(mo_Mes_Morders, domain, userAccount);
             }
@@ -3177,7 +3176,6 @@ namespace Business.ResourceExamineManagement
             List<long> itemIds = bomlist.Select(p => p.icitem_id).ToList();
             itemIds.AddRange(bomchildlist.Select(p => p.icitem_id).ToList());
             itemIds.AddRange(subdtllist.Select(p => p.icitem_id).ToList());
-            itemIds.Distinct();
             icitemlist.AddRange(_ic_item.GetListAsync(p => itemIds.Contains(p.mysql_id) && !p.IsDeleted).Result);
         }
 
@@ -3376,8 +3374,7 @@ namespace Business.ResourceExamineManagement
 
                     if (headAccount.Any())
                     {
-                        headAccount.Distinct();
-                        newNbr.User1 = string.Join(",", headAccount);
+                        newNbr.User1 = string.Join(",", headAccount.Distinct());
                         string[] user2 = headAccount.ToArray();
                         newNbr.User2 =JsonConvert.SerializeObject(user2);
                     }
@@ -3505,7 +3502,7 @@ namespace Business.ResourceExamineManagement
         public string GetMaxSerialNumber(long id, JObject? formData = null)
         {
             var modelList = _rf_serialnumber.Select(s => s.Id == id);
-            if (modelList == null && modelList.Count < 1)
+            if (modelList == null || modelList.Count < 1)
             {
                 return string.Empty;
             }
@@ -3662,8 +3659,8 @@ namespace Business.ResourceExamineManagement
                         _nbrMaster.Insert(nbrMasterList);
                         nbrMasterList.ForEach(a =>
                         {
-                            string sql = string.Format("exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'",a.Nbr,a.Date.Value.ToString("yyyy-MM-dd"),a.CreateUser);
-                            _businessDbContext.Database.ExecuteSqlRaw(sql);
+                            string sql ="exec pr_WMS_BPM_AddMobileTask @TaskID='{0}',@PlanDate='{1}',@ExecuterTypeID=2,@CreateUser='{2}'";
+                            _businessDbContext.Database.ExecuteSqlRaw(sql, a.Nbr, a.Date.Value.ToString("yyyy-MM-dd"), a.CreateUser);
                         });
 
                         if (itemstockoccupy.Any())

MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_purchase.cs

@@ -1,5 +1,6 @@
 using Business.Core.Attributes;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -173,5 +174,60 @@ namespace Business.Domain
         [Comment("供应类别")]
         public string supplier_type { get; set; }
 
+
+        /// <summary>
+        /// 关税
+        /// </summary>
+        [Precision(18, 5)]
+        [Comment("关税")]
+        public decimal? tariff { get; set; }
+
+        /// <summary>
+        /// 运费
+        /// </summary>
+        [Precision(18, 5)]
+        [Comment("运费")]
+        public decimal? freight { get; set; }
+
+        /// <summary>
+        /// 生效日期
+        /// </summary>
+        [Comment("生效日期")]
+        public DateTime? effective_date { get; set; }
+
+        /// <summary>
+        /// 失效日期
+        /// </summary>
+        [Comment("失效日期")]
+        public DateTime? expiring_date { get; set; }
+
+        /// <summary>
+        /// 配额比例
+        /// </summary>
+        [Precision(18, 5)]
+        [Comment("配额比例")]
+        public decimal? quota_rate { get; set; }
+
+        /// <summary>
+        /// 采购提前期
+        /// </summary>
+        [Precision(18, 5)]
+        [Comment("采购提前期")]
+        public decimal? lead_time { get; set; }
+
+        /// <summary>
+        /// 价格条款
+        /// </summary>
+        [StringLength(64)]
+        [Comment("价格条款")]
+        public string? price_terms { get; set; }
+
+        /// <summary>
+        /// 每箱包装数量
+        /// </summary>
+        [Precision(18, 5)]
+        [Comment("每箱包装数量")]
+        public decimal? packaging_qty { get; set; }
+
     }
 }