合并冲突

Projects/永冠OPP/WCS.Service/Works/Station/一楼入库.cs

@@ -129,7 +129,7 @@ namespace WCS.Service.Works.Station
                         task.HEIGHT = dev.Data2.GoodsSize;
 
                         db.Default.Set<WCS_TASK>().Add(task);
-                        finishTaskList.Add(new Tuple<int, StationDevice>(task.WMSTASK, dev.Entity.Create<StationDevice>()));
+                        createTaskList.Add(new Tuple<int, StationDevice>(task.WMSTASK, dev.Entity.Create<StationDevice>()));
 
                         var msg = $"下达从{dev.Entity.CODE}移动至{next}的PLC指令。";
                         msg += $"[{dev.Data.Tasknum}][{dev.Data.Goodsstart}][{dev.Data.Goodsend}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";