Explorar o código

在库检不限制下达。

tangdi %!s(int64=2) %!d(string=hai) anos
pai
achega
3768030bef

+ 5 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2987,7 +2987,8 @@ namespace Business.ResourceExamineManagement
                 var rst = await OrderResourceCheck(morders, domain, userAccount);
                 if (rst == "ok")
                 {
-                    var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
+                    //屏蔽日期过滤
+                    /*var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
                     decimal lookDay = 0;
                     if (sysSet.Any())
                     {
@@ -2995,12 +2996,13 @@ namespace Business.ResourceExamineManagement
                         lookDay = sysSet[0].UDeci1;
                     }
                     lookDay = lookDay == 0 ? 7 : lookDay;
-                    DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);
+                    DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);*/
 
                     string workords = "";
                     foreach (var mo in morders)
                     {
-                        if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state && mo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
+                        //if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state && mo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
+                        if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state)
                         {
                             workords += "," + mo.morder_no;
                             //mo.morder_state = MorderEnum.Xd_state;

+ 7 - 0
MicroServices/Business/Business.Domain/MongoDB/SRM/mo_srm_pr_main.cs

@@ -266,5 +266,12 @@ namespace Business.Domain
         [Comment("模拟计算版本号,不为空为年度长周期,为空为周计划")]
         [StringLength(80)]
         public string analogcalcversion { get; set; }
+
+        /// <summary>
+        /// SAPpr单号
+        /// </summary>
+        [StringLength(80)]
+        [Comment("SAPpr单号")]
+        public string SAP_pr_billno { get; set; }
     }
 }

+ 7 - 0
MicroServices/Business/Business.Domain/StructuredDB/SRM/srm_pr_main.cs

@@ -257,5 +257,12 @@ namespace Business.Domain
         [Comment("模拟计算版本号,不为空为年度长周期,为空为周计划")]
         [StringLength(80)]
         public string analogcalcversion { get; set; }
+
+        /// <summary>
+        /// SAPpr单号
+        /// </summary>
+        [StringLength(80)]
+        [Comment("SAPpr单号")]
+        public string SAP_pr_billno { get; set; }
     }
 }