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

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

@@ -1564,10 +1564,21 @@ namespace Business.ResourceExamineManagement
                                 if (master != null)
                                 {
                                     c.PurOrdRecID = master.RecID;
-                                    if (master.FSTID == "3")
+                                    string location = "1001";
+                                    switch (master.USAGE)
                                     {
-                                        c.Location = "VMI01";
+                                        case "标准":
+                                        case "VMI":
+                                            location = "VMI01";
+                                            break;
+                                        case "研发":
+                                            location = "1101";
+                                            break;
+                                        case "ECR":
+                                            location = "1003";
+                                            break;
                                     }
+                                    c.Location = location;
                                 }
                             });
                             _purOrdDetail.Insert(poaction.poDetailList);
@@ -2584,12 +2595,25 @@ namespace Business.ResourceExamineManagement
 
             polist.ForEach(a =>
             {
+                string buyer = "110";
+                switch (a.supplier_type)
+                {
+                    case "标准":
+                    case "VMI":
+                        break;
+                    case "研发":
+                        buyer = "130";
+                        break;
+                    case "ECR":
+                        buyer = "170";
+                        break;
+                }
                 purOrdMasters.Add(new PurOrdMaster
                 {
                     Domain = domain,
                     Potype = poType == 1 ? "po" : "pw",
                     PurOrd = a.po_billno,
-                    Buyer = a.po_purchaser_no,
+                    Buyer = buyer,
                     OrdDate = a.po_ssend_date,
                     Curr = "CNY",
                     Supp = a.supplier_no,

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -432,6 +432,7 @@ namespace Business.SystemJobManagement
                             currency = custList[i].Curr,
                             supply_type = custList[i].Type,
                             settlement = custList[i].CrTerms,
+                            create_time = DateTime.Now,
                             factory_id = factory_id,
                             tenant_id = tenant_id,
                             company_id = tenant_id
@@ -1113,7 +1114,7 @@ namespace Business.SystemJobManagement
                             continue;
                         }
                         //po.po_purchaser = m.;
-                        po.po_purchaser_no = m.Buyer;
+                        //po.po_purchaser_no = m.Buyer;
                         po.po_ssend_date = m.OrdDate;
                         po.po_tax_rate = m.Tax1;
                         po.po_express = 1;