1

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -1120,8 +1120,21 @@ namespace Khd.Core.Wcs.Wcs
                         bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 10).Any();
                         if (!hasTask)
                         {
-                            BaseEquip startEquip = StaticData.BaseEquip.First(t => t.endStationCode == baseEquip.endStationCode);
-                            List<WmsRawReturn> wmsRawReturns = dbContext.WmsRawReturn.Where(t => t.endStationCode == baseEquip.endStationCode)
+                            string endStationCode = baseEquip.endStationCode;
+                            try
+                            {
+                                List<string>? list = JsonConvert.DeserializeObject<List<string>>(baseEquip.endStationCode);
+                                if (list != null && list.Count > 0)
+                                {
+                                    endStationCode = list[0];
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+                            BaseEquip startEquip = StaticData.BaseEquip.First(t => t.endStationCode == endStationCode);
+                            List<WmsRawReturn> wmsRawReturns = dbContext.WmsRawReturn.Where(t => t.endStationCode == endStationCode)
                                 .Where(t => t.auditStatus == "1")
                                 .Where(t => t.executeStatus == "0" || t.executeStatus == "1")
                                 .ToList();