Преглед на файлове

领料单调用MES存储过程

Murphy преди 2 години
родител
ревизия
658c0f1f0b

+ 11 - 4
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2548,6 +2548,7 @@ namespace Business.ResourceExamineManagement
                     var Nbr = GetMaxSerialNumber(417416915624005);
                     //根据某一产线汇总即该工单的总数
                     decimal QtyOrdSum = dbPeriodSequences.Where(a => a.WorkOrds == workord && a.Line == lines[0]).Sum(a => a.OrdQty.GetValueOrDefault());
+                    string LocationTo= lineMasters.FirstOrDefault()?.Location;
                     nbrMasterList.Add(new NbrMaster
                     {
                         Domain = "1001",
@@ -2572,10 +2573,10 @@ namespace Business.ResourceExamineManagement
                     itemList?.ForEach(a =>
                     {
                         var find = itemLocList?.Find(c => c.ItemNum == a.ComponentItem);
-                        string LocationTo = "";
+                        string LocationFrom = "";
                         if (find != null)
                         {
-                            LocationTo = find.Location;
+                            LocationFrom = find.Location;
                         }
                         //相同物料汇总
                         var itemComponent = nbrDetailList.Find(b => b.Nbr == Nbr && b.ItemNum == a.ComponentItem);
@@ -2589,8 +2590,8 @@ namespace Business.ResourceExamineManagement
                                 ItemNum = a.ComponentItem,
                                 QtyFrom = 0,
                                 QtyTo = 0,
-                                LocationFrom = LocationTo,
-                                LocationTo = "",
+                                LocationFrom = LocationFrom,
+                                LocationTo = LocationTo,//现在这几条线是同一线边仓,暂时不考虑多个线边仓
                                 WorkOrd = workord,
                                 QtyOrd = QtyOrdSum * a.Qty,
                                 CurrQtyOpened = QtyOrdSum * a.Qty,
@@ -2863,6 +2864,11 @@ namespace Business.ResourceExamineManagement
                     try
                     {
                         _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);
+                        });
                         //快开平台用自增列RecId关联,所以需要插入后再查给明细表赋相应的值
                         List<string> nbrs = nbrMasterList.Select(a => a.Nbr).ToList();
                         var DBnbrList = _nbrMaster.Select(a => a.Domain == "1001" && a.Type == "SM" && nbrs.Contains(a.Nbr));
@@ -2871,6 +2877,7 @@ namespace Business.ResourceExamineManagement
                             c.NbrRecID = DBnbrList.Where(a => a.Nbr == c.Nbr).First().RecID;
                         });
                         _nbrDetail.Insert(nbrDetailList);
+                        
                         _workOrdMaster.Update(workOrdMasters);
                         _periodSequenceDet.Update(dbPeriodSequences);
                         _workOrdRouting.Update(workOrdRoutings);

+ 1 - 1
MicroServices/Business/Business.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "App": {
-    "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://123.60.180.165:8020,http://123.60.180.165:8022,http://123.60.180.165:8024"
+    "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://123.60.181.157:8020,http://123.60.181.157:8022,http://123.60.181.157:8024"
   },
   "ConnectionStrings": {
     //"Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=true",