.

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

@@ -2427,17 +2427,17 @@ namespace Business.ResourceExamineManagement
         }
         private void AutoCreatePOFromPR(List<srm_pr_main> list, List<ic_item> icitemlist, List<srm_supplier> itemsupplierList, List<srm_purchase> purchaselist, PoActionListDto poaction)
         {
-            //var zcPr = list.Where(a => a.pr_billno.StartsWith("PR") && a.supplier_type != "委外").ToList();
-            var zcPr = list.Where(a => a.pr_billno.StartsWith("PR")).ToList();
+            var zcPr = list.Where(a => a.pr_billno.StartsWith("PR") && a.supplier_type != "委外").ToList();
+            //var zcPr = list.Where(a => a.pr_billno.StartsWith("PR")).ToList();
             if (zcPr.Any())
             {
                 AutoCreatePOFromPRByType(zcPr, icitemlist, itemsupplierList, purchaselist, poaction, 1);
             }
-            //var wwPr = list.Where(a => a.pr_billno.StartsWith("PR") && a.supplier_type=="委外").ToList();
-            //if (wwPr.Any())
-            //{
-            //    AutoCreatePOFromPRByType(wwPr, icitemlist, itemsupplierList, purchaselist, poaction, 2);
-            //}
+            var wwPr = list.Where(a => a.pr_billno.StartsWith("PR") && a.supplier_type == "委外").ToList();
+            if (wwPr.Any())
+            {
+                AutoCreatePOFromPRByType(wwPr, icitemlist, itemsupplierList, purchaselist, poaction, 2);
+            }
         }
         /// <summary>
         /// 根据PR生成PO
@@ -2699,11 +2699,11 @@ namespace Business.ResourceExamineManagement
                 });
             });
             poaction.poDetailList.AddRange(purOrdDetails);
-            //if (poType == 2)
-            //{
-            //    var purOrdDetailBatches = GetPurOrdDetailBatches(purOrdDetails,domain, list[0].company_id.ToString()).Result;
-            //    poaction.poDetailBatchList.AddRange(purOrdDetailBatches);
-            //}
+            if (poType == 2)
+            {
+                var purOrdDetailBatches = GetPurOrdDetailBatches(purOrdDetails, domain, list[0].company_id.ToString()).Result;
+                poaction.poDetailBatchList.AddRange(purOrdDetailBatches);
+            }
         }
 
         public async Task<List<PurOrdDetailBatch>> GetPurOrdDetailBatches(List<PurOrdDetail> purOrdDetails,string domain,string company_id)

MicroServices/Business/Business.Host/appsettings.json

@@ -15,17 +15,17 @@
     //"DOPExt": "Server=123.60.181.157;Database=DOPEXT;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.181.157/dopbase",
 
-    "Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
+    //"Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
 
-    //"Default": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPLog": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPBang": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPExt": "Server=172.16.8.158;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.158/dopbase",
+    "Default": "Server=172.16.8.158;Database=dopbizhist;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPLog": "Server=172.16.8.158;Database=dopbizhist;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPBang": "Server=172.16.8.158;Database=dopbizhist;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPExt": "Server=172.16.8.158;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.158/dopbase",
     "Factory_id": "8010",
     "Company_id": "1000"
   },

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -1700,3 +1700,27 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-01-03T17:02:53.2369077+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-01-03T17:02:53.241491+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-01-03T17:02:53.2436195+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:34:23.761049+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:34:23.8100289+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:34:23.8135186+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:34:23.8153802+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:34:23.817473+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-01-07T13:34:23.8224065+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:44:54.1793513+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:44:54.2109391+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:44:54.2136978+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:44:54.2151986+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-01-07T13:44:54.2194444+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-01-07T13:44:54.2216252+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:46:55.8784539+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:46:55.9203428+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:46:55.9249846+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:46:55.9270764+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:46:55.9314477+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-01-07T14:46:55.9334066+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:53:25.5416334+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:53:25.5815392+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:53:25.5852323+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:53:25.5867275+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-01-07T14:53:25.5920851+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-01-07T14:53:25.5939255+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}